mirror of
https://github.com/discourse/discourse.git
synced 2025-02-22 04:07:27 +00:00
REFACTOR: filterBy
in UserStream
.
Follow up to ebe65577ed33f0d44c82380b194dbd13398e5237.
This commit is contained in:
parent
ebe65577ed
commit
40533bc570
@ -30,15 +30,17 @@ export default RestModel.extend({
|
||||
"/user_actions.json?offset=%@&username=%@"
|
||||
),
|
||||
|
||||
filterBy(filter, noContentHelpKey, actingUsername) {
|
||||
this.setProperties({
|
||||
filter,
|
||||
itemsLoaded: 0,
|
||||
content: [],
|
||||
noContentHelpKey,
|
||||
lastLoadedUrl: null,
|
||||
actingUsername
|
||||
});
|
||||
filterBy(opts) {
|
||||
this.setProperties(
|
||||
Object.assign(
|
||||
{
|
||||
itemsLoaded: 0,
|
||||
content: [],
|
||||
lastLoadedUrl: null
|
||||
},
|
||||
opts
|
||||
)
|
||||
);
|
||||
|
||||
return this.findItems();
|
||||
},
|
||||
|
@ -14,10 +14,8 @@ export default function(filter) {
|
||||
return this.modelFor("user").get("postsStream");
|
||||
},
|
||||
|
||||
afterModel() {
|
||||
return this.modelFor("user")
|
||||
.get("postsStream")
|
||||
.filterBy(filter);
|
||||
afterModel(model) {
|
||||
return model.filterBy({ filter });
|
||||
},
|
||||
|
||||
setupController(controller, model) {
|
||||
|
@ -10,11 +10,12 @@ export default Discourse.Route.extend(ViewingActionType, {
|
||||
},
|
||||
|
||||
afterModel(model, transition) {
|
||||
return model.filterBy(
|
||||
this.get("userActionType"),
|
||||
this.get("noContentHelpKey") || "user_activity.no_default",
|
||||
transition.queryParams.acting_username
|
||||
);
|
||||
return model.filterBy({
|
||||
filter: this.get("userActionType"),
|
||||
noContentHelpKey:
|
||||
this.get("noContentHelpKey") || "user_activity.no_default",
|
||||
actingUsername: transition.queryParams.acting_username
|
||||
});
|
||||
},
|
||||
|
||||
renderTemplate() {
|
||||
|
Loading…
x
Reference in New Issue
Block a user