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

Revert "FIX: 404 page when clicking a badge notification from before changing username"

This commit is contained in:
Neil Lalonde 2018-02-13 11:39:20 -05:00
parent 7d501058d7
commit 20e44b3c14
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/javascripts/discourse/routes/badges-show.js.es6
View File

@ -30,9 +30,20 @@ export default Discourse.Route.extend({
afterModel(model, transition) {
const username = transition.queryParams && transition.queryParams.username;
return UserBadge.findByBadgeId(model.get("id"), {username}).then(userBadges => {
const userBadgesGrant = UserBadge.findByBadgeId(model.get("id"), {username}).then(userBadges => {
this.userBadgesGrant = userBadges;
});
const userBadgesAll = UserBadge.findByUsername(username).then(userBadges => {
this.userBadgesAll = userBadges;
});
const promises = {
userBadgesGrant,
userBadgesAll,
};
return Ember.RSVP.hash(promises);
},
titleToken() {