From 90015134da2346b27dacbcf9ee54380c3ff47ad1 Mon Sep 17 00:00:00 2001
From: hairlessbear <davidhersh0402@gmail.com>
Date: Thu, 4 Jun 2015 15:18:09 -0400
Subject: [PATCH] Fixed 'group.leader.profile.name' issue and changed all
 instances of 'group.leader' to 'group.leader._id'

---
 website/src/controllers/groups.js       |  1 +
 website/views/options/social/group.jade | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/website/src/controllers/groups.js b/website/src/controllers/groups.js
index b9d2643c61..321a460760 100644
--- a/website/src/controllers/groups.js
+++ b/website/src/controllers/groups.js
@@ -41,6 +41,7 @@ var populateQuery = function(type, q, additionalFields){
   else
     q.populate(guildPopulate);
   q.populate('invites', nameFields);
+  q.populate('leader', nameFields);
   q.populate({
     path: 'challenges',
     match: (type=='habitrpg') ? {_id:{$ne:'95533e05-1ff9-4e46-970b-d77219f199e9'}} : undefined, // remove the Spread the Word Challenge for now, will revisit when we fix the closing-challenge bug
diff --git a/website/views/options/social/group.jade b/website/views/options/social/group.jade
index 858df2adee..50609912d8 100644
--- a/website/views/options/social/group.jade
+++ b/website/views/options/social/group.jade
@@ -22,7 +22,7 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter
                 span.glyphicon.glyphicon-ban-circle
                 =env.t('leave')
               a.btn.btn-success.pull-right(ng-if=':: !isMemberOfGroup(User.user._id, group)', ng-click='join(group)')=env.t('join')
-            span(ng-if='group.leader == user.id')
+            span(ng-if='group.leader._id == user.id')
               button.btn.btn-sm.btn-primary.pull-right(ng-click='save(group)', ng-show='group._editing')=env.t('save')
               button.btn.btn-sm.btn-default.pull-right(ng-click='group._editing = true', ng-hide='group._editing')=env.t('editGroup')
 
@@ -52,8 +52,8 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter
             markdown(text='group.description')
           hr
           p=env.t('groupLeader')
-            a(class='badge badge-info', ng-click='clickMember(group.leader, true)')
-              | {{group.leader}}
+            a(class='badge badge-info', ng-click='clickMember(group.leader._id, true)')
+              | {{group.leader.profile.name}}
           .formatting-help
             small.muted=env.t('groupID')
               | {{group._id}}
@@ -83,10 +83,10 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter
               ng-change='set({"party.orderAscending": user.party.orderAscending})'
               )
           table.table.table-striped(bindonce='group')
-            tr(ng-repeat='member in group.members track by member._id' ng-if='member._id != group.leader')
+            tr(ng-repeat='member in group.members track by member._id' ng-if='member._id != group.leader._id')
               td.media
                 // allow leaders to ban members
-                div.pull-left(ng-show='group.leader == user.id')
+                div.pull-left(ng-show='group.leader._id == user.id')
                   a.media-object(ng-click='removeMember(group, member, true)')
                     span.glyphicon.glyphicon-ban-circle(tooltip=env.t('banTip'))
                 a.media-body
@@ -103,7 +103,7 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter
             tr(ng-repeat='invite in group.invites')
               td.media
                 // allow leaders to ban members
-                div.pull-left(ng-show='group.leader == user.id')
+                div.pull-left(ng-show='group.leader._id == user.id')
                   a.media-object(ng-click='removeMember(group, invite, false)')
                     span.glyphicon.glyphicon-ban-circle(tooltip=env.t('banTip'))
                 a.media-body
@@ -122,7 +122,7 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter
           td
             .popover.static-popover.fade.right.in.wide-popover
               .arrow
-              h3.popover-title {{Members.members[group.leader].profile.name}}
+              h3.popover-title {{group.leader.profile.name}}
               .popover-content
                 markdown(text='group.leaderMessage')
       div(ng-controller='ChatCtrl')