github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-07 09:34:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Respect default category sort when filter=default (#23411)

Browse Source 
Previously we would respect it if the filter was `nil`, but if `default` was explicitly passed then it would ignore the category order settings. This explicit passing of `filter=default` happens for some types of navigations in the JS app.

This extends the fix from 92bc61b4be9242dd0242ed60641a5129938a231a
This commit is contained in:
David Taylor
2023-09-05 19:05:30 +01:00
committed by GitHub
parent 2ed223fced
commit 534f62cf5b
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/topic_query.rb
View File

@ -749,7 +749,7 @@ class TopicQuery
# category default sort order # category default sort order
sort_order, sort_ascending = sort_order, sort_ascending =
Category.where(id: category_id).pick(:sort_order, :sort_ascending) Category.where(id: category_id).pick(:sort_order, :sort_ascending)
if sort_order && (filter.blank? || %w[latest unseen].include?(filter.to_s)) if sort_order && (filter.blank? || %w[default latest unseen].include?(filter.to_s))
options[:order] = sort_order options[:order] = sort_order
options[:ascending] = !!sort_ascending ? "true" : "false" options[:ascending] = !!sort_ascending ? "true" : "false"
else else

11
spec/lib/topic_query_spec.rb
View File

@ -1005,6 +1005,17 @@ RSpec.describe TopicQuery do
expect(topic_ids - [topic_category.id]).to eq([topic_in_cat1.id, topic_in_cat2.id]) expect(topic_ids - [topic_category.id]).to eq([topic_in_cat1.id, topic_in_cat2.id])
end end
it "uses the category's default sort order when filter=default is passed explicitly" do
category.update!(sort_order: "created", sort_ascending: true)
topic_ids =
TopicQuery
.new(user, category: category.id, filter: "default")
.list_latest
.topics
.map(&:id)
expect(topic_ids - [topic_category.id]).to eq([topic_in_cat1.id, topic_in_cat2.id])
end
it "should apply default sort order to latest and unseen filters only" do it "should apply default sort order to latest and unseen filters only" do
category.update!(sort_order: "created", sort_ascending: true) category.update!(sort_order: "created", sort_ascending: true)