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

FEATURE: category setting for default top period

This commit is contained in:
Neil Lalonde 2017-03-22 16:54:12 -04:00
parent 0c46f51412
commit 11ce73b8ed
10 changed files with 49 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/discourse/components/edit-category-settings.js.es6
View File

@ -27,6 +27,13 @@ export default buildCategoryPanel('settings', {
];
},
@computed
availableTopPeriods() {
return ['all', 'yearly', 'quarterly', 'monthly', 'weekly', 'daily'].map((p) => {
return {name: I18n.t(`filters.top.${p}.title`), value: p};
});
},
@computed
availableSorts() {
return ['likes', 'op_likes', 'views', 'posts', 'activity', 'posters', 'category', 'created']

3
app/assets/javascripts/discourse/models/category.js.es6
View File

@ -106,7 +106,8 @@ const Category = RestModel.extend({
show_subcategory_list: this.get('show_subcategory_list'),
num_featured_topics: this.get('num_featured_topics'),
default_view: this.get('default_view'),
subcategory_list_style: this.get('subcategory_list_style')
subcategory_list_style: this.get('subcategory_list_style'),
default_top_period: this.get('default_top_period')
},
type: id ? 'PUT' : 'POST'
});

7
app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
View File

@ -44,6 +44,13 @@
</label>
</section>
<section class="field default-top-period-field">
<label>
{{i18n "category.default_top_period"}}
{{combo-box valueAttribute="value" content=availableTopPeriods value=category.default_top_period}}
</label>
</section>
<section class="field">
<label>
{{i18n "category.sort_order"}}

1
app/controllers/categories_controller.rb
View File

@ -249,6 +249,7 @@ class CategoriesController < ApplicationController
:num_featured_topics,
:default_view,
:subcategory_list_style,
:default_top_period,
:custom_fields => [params[:custom_fields].try(:keys)],
:permissions => [*p.try(:keys)],
:allowed_tags => [],

19
app/controllers/list_controller.rb
View File

@ -366,8 +366,15 @@ class ListController < ApplicationController
exclude_category_ids.pluck(:id)
end
def self.best_period_with_topics_for(previous_visit_at, category_id=nil)
best_periods_for(previous_visit_at).each do |period|
def self.best_period_for(previous_visit_at, category_id=nil)
default_period = ((category_id && Category.where(id: category_id).pluck(:default_top_period).first) ||
SiteSetting.top_page_default_timeframe).to_sym
best_period_with_topics_for(previous_visit_at, category_id, default_period) || default_period
end
def self.best_period_with_topics_for(previous_visit_at, category_id=nil, default_period=SiteSetting.top_page_default_timeframe)
best_periods_for(previous_visit_at, default_period.to_sym).each do |period|
top_topics = TopTopic.where("#{period}_score > 0")
top_topics = top_topics.joins(:topic).where("topics.category_id = ?", category_id) if category_id
top_topics = top_topics.limit(SiteSetting.topics_per_period_in_top_page)
@ -377,14 +384,8 @@ class ListController < ApplicationController
false
end
def self.best_period_for(previous_visit_at, category_id=nil)
best_period_with_topics_for(previous_visit_at, category_id) ||
SiteSetting.top_page_default_timeframe.to_sym
end
def self.best_periods_for(date)
def self.best_periods_for(date, default_period=:all)
date ||= 1.year.ago
default_period = SiteSetting.top_page_default_timeframe.to_sym
periods = []
periods << default_period if :all != default_period
periods << :daily if :daily != default_period && date > 8.days.ago

1
app/models/category.rb
View File

@ -561,6 +561,7 @@ end
# num_featured_topics :integer default(3)
# default_view :string(50)
# subcategory_list_style :string(50) default("rows_with_featured_topics")
# default_top_period :string(20) default("all")
#
# Indexes
#

3
app/serializers/basic_category_serializer.rb
View File

@ -23,7 +23,8 @@ class BasicCategorySerializer < ApplicationSerializer
:show_subcategory_list,
:num_featured_topics,
:default_view,
:subcategory_list_style
:subcategory_list_style,
:default_top_period
has_one :uploaded_logo, embed: :object, serializer: CategoryUploadSerializer
has_one :uploaded_background, embed: :object, serializer: CategoryUploadSerializer

1
config/locales/client.en.yml
View File

@ -1993,6 +1993,7 @@ en:
subcategory_list_style: "Subcategory List Style:"
sort_order: "Topic List Sort By:"
default_view: "Default Topic List:"
default_top_period: "Default Top Period:"
allow_badges_label: "Allow badges to be awarded in this category"
edit_permissions: "Edit Permissions"
add_permission: "Add Permission"

5
db/migrate/20170322191305_add_default_top_period_to_categories.rb Normal file
View File

@ -0,0 +1,5 @@
class AddDefaultTopPeriodToCategories < ActiveRecord::Migration
def change
add_column :categories, :default_top_period, :string, limit: 20, default: 'all'
end
end

36
spec/controllers/list_controller_spec.rb
View File

@ -193,8 +193,8 @@ describe ListController do
describe "category default views" do
it "top default view" do
category.update_attributes!(default_view: 'top')
described_class.expects(:best_period_for).returns('yearly')
category.update_attributes!(default_view: 'top', default_top_period: 'monthly')
described_class.expects(:best_period_with_topics_for).with(anything, category.id, :monthly).returns(:monthly)
xhr :get, :category_default, category: category.slug
expect(response).to be_success
end
@ -291,62 +291,52 @@ describe ListController do
describe "best_periods_for" do
it "returns yearly for more than 180 days" do
SiteSetting.top_page_default_timeframe = 'all'
expect(ListController.best_periods_for(nil)).to eq([:yearly])
expect(ListController.best_periods_for(180.days.ago)).to eq([:yearly])
expect(ListController.best_periods_for(nil, :all)).to eq([:yearly])
expect(ListController.best_periods_for(180.days.ago, :all)).to eq([:yearly])
end
it "includes monthly when less than 180 days and more than 35 days" do
SiteSetting.top_page_default_timeframe = 'all'
(35...180).each do |date|
expect(ListController.best_periods_for(date.days.ago)).to eq([:monthly, :yearly])
expect(ListController.best_periods_for(date.days.ago, :all)).to eq([:monthly, :yearly])
end
end
it "includes weekly when less than 35 days and more than 8 days" do
SiteSetting.top_page_default_timeframe = 'all'
(8...35).each do |date|
expect(ListController.best_periods_for(date.days.ago)).to eq([:weekly, :monthly, :yearly])
expect(ListController.best_periods_for(date.days.ago, :all)).to eq([:weekly, :monthly, :yearly])
end
end
it "includes daily when less than 8 days" do
SiteSetting.top_page_default_timeframe = 'all'
(0...8).each do |date|
expect(ListController.best_periods_for(date.days.ago)).to eq([:daily, :weekly, :monthly, :yearly])
expect(ListController.best_periods_for(date.days.ago, :all)).to eq([:daily, :weekly, :monthly, :yearly])
end
end
it "returns default even for more than 180 days" do
SiteSetting.top_page_default_timeframe = 'monthly'
expect(ListController.best_periods_for(nil)).to eq([:monthly, :yearly])
expect(ListController.best_periods_for(180.days.ago)).to eq([:monthly, :yearly])
expect(ListController.best_periods_for(nil, :monthly)).to eq([:monthly, :yearly])
expect(ListController.best_periods_for(180.days.ago, :monthly)).to eq([:monthly, :yearly])
end
it "returns default even when less than 180 days and more than 35 days" do
SiteSetting.top_page_default_timeframe = 'weekly'
(35...180).each do |date|
expect(ListController.best_periods_for(date.days.ago)).to eq([:weekly, :monthly, :yearly])
expect(ListController.best_periods_for(date.days.ago, :weekly)).to eq([:weekly, :monthly, :yearly])
end
end
it "returns default even when less than 35 days and more than 8 days" do
SiteSetting.top_page_default_timeframe = 'daily'
(8...35).each do |date|
expect(ListController.best_periods_for(date.days.ago)).to eq([:daily, :weekly, :monthly, :yearly])
expect(ListController.best_periods_for(date.days.ago, :daily)).to eq([:daily, :weekly, :monthly, :yearly])
end
end
it "doesn't return default when set to all" do
SiteSetting.top_page_default_timeframe = 'all'
expect(ListController.best_periods_for(nil)).to eq([:yearly])
expect(ListController.best_periods_for(nil, :all)).to eq([:yearly])
end
it "doesn't return value twice when matches default" do
SiteSetting.top_page_default_timeframe = 'yearly'
expect(ListController.best_periods_for(nil)).to eq([:yearly])
expect(ListController.best_periods_for(nil, :yearly)).to eq([:yearly])
end
end
describe "categories suppression" do