sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-22 03:34:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

port member modal to group members list, fix #1656

Browse source
This commit is contained in:
Matteo Pagliazzi 2013-10-28 18:27:03 +01:00
parent 34fedca239
commit e0c95b3a86
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
public/js/services/memberServices.js
View file

@ -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){

2
views/options/groups/group.jade
View file

@ -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