Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUGFIX: correctly auto-select /top time range when filtering on a category

This commit is contained in:
Régis Hanol 2014-05-14 11:49:50 +02:00
parent b232736242
commit 3fde28e108
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/list_controller.rb
View File

@ -314,7 +314,7 @@ class ListController < ApplicationController
topic_query = TopicQuery.new(current_user, options)
if current_user.present?
periods = [ListController.best_period_for(current_user.previous_visit_at)]
periods = [ListController.best_period_for(current_user.previous_visit_at, options[:category])]
else
periods = TopTopic.periods
end
@ -324,9 +324,13 @@ class ListController < ApplicationController
top
end
def self.best_period_for(previous_visit_at)
ListController.best_periods_for(previous_visit_at).each do |period|
return period if TopTopic.where("#{period}_score > 0").count >= SiteSetting.topics_per_period_in_top_page
def self.best_period_for(previous_visit_at, category_id=nil)
best_periods_for(previous_visit_at).each do |period|
top_topics = TopTopic.where("#{period}_score > 0")
if category_id
top_topics = top_topics.joins(:topic).where("topics.category_id = ?", category_id)
end
return period if top_topics.count >= SiteSetting.topics_per_period_in_top_page
end
# default period is yearly
:yearly