Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-22 04:07:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Reset max_posts query parameter (#10334)

Browse Source
This commit is contained in:
Bianca Nenciu 2020-08-03 11:19:36 +03:00 committed by GitHub
parent ac76bfb400
commit 12913a46e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/assets/javascripts/discourse/app/routes/build-category-route.js
View File

@ -10,6 +10,7 @@ import PermissionType from "discourse/models/permission-type";
import CategoryList from "discourse/models/category-list"; import CategoryList from "discourse/models/category-list";
import Category from "discourse/models/category"; import Category from "discourse/models/category";
import { Promise, all } from "rsvp"; import { Promise, all } from "rsvp";
import { action } from "@ember/object";
// A helper function to create a category route with parameters // A helper function to create a category route with parameters
export default (filterArg, params) => { export default (filterArg, params) => {
@ -229,9 +230,26 @@ export default (filterArg, params) => {
}); });
}, },
resetParams(controller) {
controller.setProperties({
order: "default",
ascending: false,
max_posts: null
});
},
@action
willTransition() {
this._super(...arguments);
if (this.controller) {
this.resetParams(this.controller);
}
},
resetController(controller, isExiting) { resetController(controller, isExiting) {
if (isExiting) { if (isExiting) {
controller.setProperties({ order: "default", ascending: false }); this.resetParams(controller);
} }
}, },

20
app/assets/javascripts/discourse/app/routes/build-topic-route.js
View File

@ -6,6 +6,7 @@ import { defaultHomepage } from "discourse/lib/utilities";
import Session from "discourse/models/session"; import Session from "discourse/models/session";
import { Promise } from "rsvp"; import { Promise } from "rsvp";
import Site from "discourse/models/site"; import Site from "discourse/models/site";
import { action } from "@ember/object";
// A helper to build a topic route for a filter // A helper to build a topic route for a filter
function filterQueryParams(params, defaultParams) { function filterQueryParams(params, defaultParams) {
@ -147,9 +148,26 @@ export default function(filter, extras) {
); );
}, },
resetParams(controller) {
controller.setProperties({
order: "default",
ascending: false,
max_posts: null
});
},
@action
willTransition() {
this._super(...arguments);
if (this.controller) {
this.resetParams(this.controller);
}
},
resetController(controller, isExiting) { resetController(controller, isExiting) {
if (isExiting) { if (isExiting) {
controller.setProperties({ order: "default", ascending: false }); this.resetParams(controller);
} }
}, },