IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-29 12:13:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: order categories based on recent activity when using categories_and_latest_topics layout (#7166)

Browse Source
This commit is contained in:
Maja Komel 2019-03-15 07:14:49 +01:00 committed by Sam
parent cb1f909fa4
commit 32db3ac228
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/category_list.rb
View File

@ -77,6 +77,8 @@ class CategoryList
if SiteSetting.fixed_category_positions
@categories = @categories.order(:position, :id)
elsif !SiteSetting.fixed_category_positions && SiteSetting.desktop_category_page_style == "categories_and_latest_topics"
@categories = @categories.includes(:latest_post).order("posts.created_at DESC NULLS LAST").order('categories.id ASC')
else
@categories = @categories.order('COALESCE(categories.posts_week, 0) DESC')
.order('COALESCE(categories.posts_month, 0) DESC')

17
spec/models/category_list_spec.rb
View File

@ -147,6 +147,7 @@ describe CategoryList do
context 'fixed_category_positions is disabled' do
before do
SiteSetting.fixed_category_positions = false
SiteSetting.desktop_category_page_style = "categories_and_top_topics"
end
it "returns categories in order of activity" do
@ -159,6 +160,22 @@ describe CategoryList do
cat1, cat2 = Fabricate(:category, position: 1), Fabricate(:category, position: 0)
expect(category_ids).to eq([cat1.id, cat2.id])
end
context "when using categories_and_latest_topics layout" do
before do
SiteSetting.desktop_category_page_style = "categories_and_latest_topics"
end
it "returns categories in order of latest activity" do
post1 = Fabricate(:post, created_at: 1.hour.ago)
post2 = Fabricate(:post, created_at: 1.day.ago)
post3 = Fabricate(:post, created_at: 1.week.ago)
cat1 = Fabricate(:category, position: 0, latest_post_id: post2.id)
cat2 = Fabricate(:category, position: 1, latest_post_id: post3.id)
cat3 = Fabricate(:category, position: 1, latest_post_id: post1.id)
expect(category_ids).to eq([cat3.id, cat1.id, cat2.id])
end
end
end
end