From de0d13e4eff9768db8e2ded7e161ce768cafd22b Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 4 May 2017 11:58:35 -0400
Subject: [PATCH] FIX: Badge filtering was always to the currentUser

---
 .../javascripts/discourse/components/badge-card.js.es6    | 8 +++-----
 .../javascripts/discourse/templates/badges/index.hbs      | 2 +-
 .../javascripts/discourse/templates/user/badges.hbs       | 6 +++++-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/badge-card.js.es6 b/app/assets/javascripts/discourse/components/badge-card.js.es6
index ea10bbd0e55..0f159812b18 100644
--- a/app/assets/javascripts/discourse/components/badge-card.js.es6
+++ b/app/assets/javascripts/discourse/components/badge-card.js.es6
@@ -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')
diff --git a/app/assets/javascripts/discourse/templates/badges/index.hbs b/app/assets/javascripts/discourse/templates/badges/index.hbs
index 1c211cf2ade..12adeb3d06f 100644
--- a/app/assets/javascripts/discourse/templates/badges/index.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/index.hbs
@@ -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}}
diff --git a/app/assets/javascripts/discourse/templates/user/badges.hbs b/app/assets/javascripts/discourse/templates/user/badges.hbs
index 458525bd299..878a2f6f80b 100644
--- a/app/assets/javascripts/discourse/templates/user/badges.hbs
+++ b/app/assets/javascripts/discourse/templates/user/badges.hbs
@@ -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}}