From e0c95b3a8620a2294aa312dfc3e39ef52b5dec96 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Mon, 28 Oct 2013 18:27:03 +0100 Subject: [PATCH] port member modal to group members list, fix #1656 --- public/js/services/memberServices.js | 7 +++++-- views/options/groups/group.jade | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/public/js/services/memberServices.js b/public/js/services/memberServices.js index 5c16118b85..f969bb336c 100644 --- a/public/js/services/memberServices.js +++ b/public/js/services/memberServices.js @@ -58,8 +58,11 @@ angular.module('memberServices', ['ngResource']). selectMember: function(uid) { var self = this; // Fetch from cache if we can. For guild members, only their uname will have been fetched on initial load, - // check if they have full fields (eg, check profile.items) and if not, fetch them - if (members[uid] && members[uid].items) { + // check if they have full fields (eg, check profile.items and an item inside + // because sometimes profile.items exists but it's empty like when user is fetched for party + // and then for guild) + // and if not, fetch them + if (members[uid] && members[uid].items && members[uid].items.weapon) { self.selectedMember = members[uid]; } else { Member.get({uid: uid}, function(member){ diff --git a/views/options/groups/group.jade b/views/options/groups/group.jade index 20f7fa5e5e..505e50bdb7 100644 --- a/views/options/groups/group.jade +++ b/views/options/groups/group.jade @@ -67,7 +67,7 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank' i.icon-ban-circle(tooltip='Boot Member') // {{/}} a(data-toggle='modal', data-target='#avatar-modal-{{member._id}}') - span(ng-class='{"badge badge-info": group.leader==member._id}') + span(ng-class='{"badge badge-info": group.leader==member._id}', ng-click='clickMember(member._id, true)') | {{username(member.auth, member.profile.name)}} td ({{member._id}}) .modal-footer.whatever-options