github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-23 03:11:31 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #4147 from cpradio/default_top_timeframe

Browse Source 
FIX: Use default top setting when user is return or enough data exists for Top Page Results
This commit is contained in:
Régis Hanol
2016-04-06 18:33:56 +02:00
parent 189d70661e c5bb1d1cfe
commit 2b9e8e5a7d
2 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/list_controller.rb
View File

@ -334,16 +334,18 @@ class ListController < ApplicationController
return period if top_topics.count >= SiteSetting.topics_per_period_in_top_page
end
# default period is yearly
SiteSetting.top_page_default_timeframe
SiteSetting.top_page_default_timeframe.to_sym
end
def self.best_periods_for(date)
date ||= 1.year.ago
default_period = SiteSetting.top_page_default_timeframe.to_sym
periods = []
periods << :daily if date > 8.days.ago
periods << :weekly if date > 35.days.ago
periods << :monthly if date > 180.days.ago
periods << :yearly
periods << default_period if :all != default_period
periods << :daily if :daily != default_period && date > 8.days.ago
periods << :weekly if :weekly != default_period && date > 35.days.ago
periods << :monthly if :monthly != default_period && date > 180.days.ago
periods << :yearly if :yearly != default_period
periods
end