IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: preference page error when badges are disabled

Browse Source
This commit is contained in:
Neil Lalonde
2018-04-09 14:27:00 -04:00
parent 1b351a3355
commit d7ea6f93e7
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/discourse/routes/preferences-account.js.es6
View File

@@ -6,10 +6,14 @@ export default RestrictedUserRoute.extend({
model: function() {
const user = this.modelFor('user');
return UserBadge.findByUsername(this.modelFor('user').get('username')).then(userBadges => {
user.set('badges', userBadges.map(ub => ub.badge));
return user;
});
if (this.siteSettings.enable_badges) {
return UserBadge.findByUsername(this.modelFor('user').get('username')).then(userBadges => {
user.set('badges', userBadges.map(ub => ub.badge));
return user;
});
} else {
return user;
}
},
setupController(controller, user) {