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

FIX: Filter badges to user on their badges page too

This commit is contained in:
Robin Ward 2017-05-03 17:58:45 -04:00
parent bf322281e3
commit 60693240e1
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/components/badge-card.js.es6
View File

@ -5,9 +5,11 @@ export default Ember.Component.extend({
size: 'medium', size: 'medium',
classNameBindings: [':badge-card', 'size', 'badge.slug'], classNameBindings: [':badge-card', 'size', 'badge.slug'],
@computed('badge.url', 'badge.has_badge') @computed('badge.url', 'filterUser')
url(url, hasBadge) { url(badgeUrl, filterUser) {
return hasBadge ? `${url}?username=${this.currentUser.get('username_lower')}` : url; return (filterUser) ?
`${badgeUrl}?username=${this.currentUser.get('username_lower')}` :
badgeUrl;
}, },
@computed('count', 'badge.grant_count') @computed('count', 'badge.grant_count')

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

@ -10,7 +10,7 @@
</div> </div>
{{#each bg.badges as |b|}} {{#each bg.badges as |b|}}
{{badge-card badge=b}} {{badge-card badge=b filterUser=b.has_badge}}
{{/each}} {{/each}}
</div> </div>
{{/each}} {{/each}}

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

@ -1,5 +1,5 @@
{{#d-section pageClass="user-badges" class="user-content user-badges-list"}} {{#d-section pageClass="user-badges" class="user-content user-badges-list"}}
{{#each sortedBadges as |ub|}} {{#each sortedBadges as |ub|}}
{{badge-card badge=ub.badge count=ub.count username=username}} {{badge-card badge=ub.badge count=ub.count username=username filterUser="true"}}
{{/each}} {{/each}}
{{/d-section}} {{/d-section}}