github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-19 05:52:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix the specs

Browse Source
This commit is contained in:
Régis Hanol 2014-01-17 15:32:23 +01:00
parent 129617b415
commit e31789327e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/list_controller.rb
View File

@ -10,7 +10,7 @@ class ListController < ApplicationController
:top_lists, TopTopic.periods.map { |p| "top_#{p}".to_sym }
].flatten
before_filter :set_category, only: [:category_feed]
before_filter :set_category, only: [:category, :category_none, :category_feed]
skip_before_filter :check_xhr
# Create our filters
@ -155,7 +155,7 @@ class ListController < ApplicationController
parent_slug_or_id = params[:parent_category]
parent_category_id = nil
if parent_slug.present?
if parent_slug_or_id.present?
parent_category_id = Category.where(slug: parent_slug_or_id).pluck(:id).first ||
Category.where(id: parent_slug_or_id.to_i).pluck(:id).first