IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-20 11:48:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: ensures category order keeps consistent (#10165)

Browse Source 
Before this change:
- first full page load would get category defaults defined un cateory settings
- a navigation to a topic and then back to categories list would reset defaut to the ones defined in discovery/topics
This commit is contained in:
Joffrey JAFFEUX 2020-07-07 09:56:38 +02:00 committed by GitHub
parent 0c742dd022
commit 9b7000dbf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/app/controllers/discovery/topics.js
View File

@ -21,7 +21,7 @@ const controllerOpts = {
showTopicPostBadges: not("discoveryTopics.new"), showTopicPostBadges: not("discoveryTopics.new"),
redirectedReason: alias("currentUser.redirected_to_top.reason"), redirectedReason: alias("currentUser.redirected_to_top.reason"),
order: "default", order: null,
ascending: false, ascending: false,
expandGloballyPinned: false, expandGloballyPinned: false,
expandAllPinned: false, expandAllPinned: false,
@ -37,11 +37,11 @@ const controllerOpts = {
changeSort(sortBy) { changeSort(sortBy) {
if (sortBy === this.order) { if (sortBy === this.order) {
this.toggleProperty("ascending"); this.toggleProperty("ascending");
this.model.refreshSort(sortBy, this.ascending);
} else { } else {
this.setProperties({ order: sortBy, ascending: false }); this.setProperties({ order: sortBy, ascending: false });
this.model.refreshSort(sortBy, false);
} }
this.model.refreshSort(sortBy, this.ascending);
}, },
// Show newly inserted topics // Show newly inserted topics

3
lib/topic_query.rb
View File

@ -684,6 +684,9 @@ class TopicQuery
if sort_order if sort_order
options[:order] = sort_order options[:order] = sort_order
options[:ascending] = !!sort_ascending ? 'true' : 'false' options[:ascending] = !!sort_ascending ? 'true' : 'false'
else
options[:order] = 'default'
options[:ascending] = 'false'
end end
end end
end end