github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-25 04:56:40 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

REFACTOR: filterBy in UserStream.

Browse Source 
Follow up to ebe65577ed33f0d44c82380b194dbd13398e5237.
This commit is contained in:
Guo Xiang Tan 2019-01-16 10:53:44 +08:00
parent ebe65577ed
commit 40533bc570
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/assets/javascripts/discourse/models/user-stream.js.es6
View File

@ -30,15 +30,17 @@ export default RestModel.extend({
"/user_actions.json?offset=%@&username=%@" "/user_actions.json?offset=%@&username=%@"
), ),
filterBy(filter, noContentHelpKey, actingUsername) { filterBy(opts) {
this.setProperties({ this.setProperties(
filter, Object.assign(
itemsLoaded: 0, {
content: [], itemsLoaded: 0,
noContentHelpKey, content: [],
lastLoadedUrl: null, lastLoadedUrl: null
actingUsername },
}); opts
)
);
return this.findItems(); return this.findItems();
}, },

6
app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js.es6
View File

@ -14,10 +14,8 @@ export default function(filter) {
return this.modelFor("user").get("postsStream"); return this.modelFor("user").get("postsStream");
}, },
afterModel() { afterModel(model) {
return this.modelFor("user") return model.filterBy({ filter });
.get("postsStream")
.filterBy(filter);
}, },
setupController(controller, model) { setupController(controller, model) {

11
app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
View File

@ -10,11 +10,12 @@ export default Discourse.Route.extend(ViewingActionType, {
}, },
afterModel(model, transition) { afterModel(model, transition) {
return model.filterBy( return model.filterBy({
this.get("userActionType"), filter: this.get("userActionType"),
this.get("noContentHelpKey") || "user_activity.no_default", noContentHelpKey:
transition.queryParams.acting_username this.get("noContentHelpKey") || "user_activity.no_default",
); actingUsername: transition.queryParams.acting_username
});
}, },
renderTemplate() { renderTemplate() {