github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-27 23:53:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Badge filtering was always to the currentUser

Browse Source
This commit is contained in:
Robin Ward 2017-05-04 11:58:35 -04:00
parent f4c09e9e90
commit de0d13e4ef
3 changed files with 9 additions and 7 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,11 +5,9 @@ export default Ember.Component.extend({
size: 'medium',
classNameBindings: [':badge-card', 'size', 'badge.slug'],
@computed('badge.url', 'filterUser')
url(badgeUrl, filterUser) {
return (filterUser && this.currentUser) ?
`${badgeUrl}?username=${this.currentUser.get('username_lower')}` :
badgeUrl;
@computed('badge.url', 'filterUser', 'username')
url(badgeUrl, filterUser, username) {
return filterUser ? `${badgeUrl}?username=${username}` : badgeUrl;
},
@computed('count', 'badge.grant_count')

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

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

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

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