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

FIX: Query parameters were not being cleared when changing filtering.

This commit is contained in:
Robin Ward 2017-02-27 15:47:56 -05:00
parent cfedbad0e9
commit b2b7f4d905
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,10 @@ const controllerOpts = {
expandGloballyPinned: false, expandGloballyPinned: false,
expandAllPinned: false, expandAllPinned: false,
resetParams() {
this.setProperties({ order: "default", ascending: false });
},
actions: { actions: {
changeSort(sortBy) { changeSort(sortBy) {
@ -43,8 +47,7 @@ const controllerOpts = {
refresh() { refresh() {
const filter = this.get('model.filter'); const filter = this.get('model.filter');
this.resetParams();
this.setProperties({ order: "default", ascending: false });
// Don't refresh if we're still loading // Don't refresh if we're still loading
if (this.get('discovery.loading')) { return; } if (this.get('discovery.loading')) { return; }

5
app/assets/javascripts/discourse/lib/url.js.es6
View File

@ -326,6 +326,11 @@ const DiscourseURL = Ember.Object.extend({
if (opts.replaceURL) { if (opts.replaceURL) {
this.replaceState(path); this.replaceState(path);
} else { } else {
const discoveryTopics = this.controllerFor('discovery/topics');
if (discoveryTopics) {
discoveryTopics.resetParams();
}
router.router.updateURL(path); router.router.updateURL(path);
} }