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

FIX: don't show badges in summary page if badges disabled

This commit is contained in:
Sam 2016-03-29 17:11:47 +11:00
parent 24630f6b54
commit adbc22530c
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/discourse/models/user.js.es6
View File

@ -410,11 +410,13 @@ const User = RestModel.extend({
summary.topics = summary.topic_ids.map(id => topicMap[id]);
summary.badges = summary.badges.map(ub => {
const badge = badgeMap[ub.badge_id];
badge.count = ub.count;
return badge;
});
if (summary.badges) {
summary.badges = summary.badges.map(ub => {
const badge = badgeMap[ub.badge_id];
badge.count = ub.count;
return badge;
});
}
return summary;
});
}

4
app/serializers/user_summary_serializer.rb
View File

@ -15,4 +15,8 @@ class UserSummarySerializer < ApplicationSerializer
attributes :likes_given, :likes_received, :posts_read_count,
:days_visited, :topic_count, :post_count
def include_badges?
SiteSetting.enable_badges
end
end