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: Fix badge count of other users. (#6016)

Browse Source 
Don't count the current user in "Others with this badge".
This commit is contained in:
Misaka 0x4e21 2018-07-02 15:34:09 +08:00 committed by Guo Xiang Tan
parent 969e79d7c6
commit cb86c5ae1e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/controllers/badges/show.js.es6
View File

@ -28,6 +28,11 @@ export default Ember.Controller.extend(BadgeSelectController, {
return username ? userCount : modelCount; return username ? userCount : modelCount;
}, },
@computed("model.grant_count", "userBadges.grant_count")
othersCount(modelCount, userCount) {
return modelCount - userCount;
},
@computed("model.allow_title", "model.has_badge", "model") @computed("model.allow_title", "model.has_badge", "model")
canSelectTitle(hasTitleBadges, hasBadge) { canSelectTitle(hasTitleBadges, hasBadge) {
return this.siteSettings.enable_badges && hasTitleBadges && hasBadge; return this.siteSettings.enable_badges && hasTitleBadges && hasBadge;

2
app/assets/javascripts/discourse/templates/badges/show.hbs
View File

@ -52,7 +52,7 @@
{{#unless canLoadMore}} {{#unless canLoadMore}}
{{#if canShowOthers}} {{#if canShowOthers}}
<div class='clearfix'> <div class='clearfix'>
<a class='btn' href='{{model.url}}'>{{i18n 'badges.others_count' count=model.grant_count}}</a> <a class='btn' href='{{model.url}}'>{{i18n 'badges.others_count' count=othersCount}}</a>
</div> </div>
{{/if}} {{/if}}
{{/unless}} {{/unless}}