diff --git a/public/js/controllers/groupsCtrl.js b/public/js/controllers/groupsCtrl.js index dda5c79448..64897360e0 100644 --- a/public/js/controllers/groupsCtrl.js +++ b/public/js/controllers/groupsCtrl.js @@ -140,6 +140,11 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Groups', '$http', 'A // if (~i) $scope.groups.guilds.splice(i, 1); alert('Left guild, refresh page to see changes') } + + $scope.reject = function(guild){ + var i = _.findIndex(User.user.invitations.guilds, {id:guild._id}); + if (~i) User.set('invitations.guilds', User.user.invitations.guilds.splice(i,1)); + } } ]) diff --git a/src/controllers/groups.js b/src/controllers/groups.js index 162087b38a..1a06bb8e72 100644 --- a/src/controllers/groups.js +++ b/src/controllers/groups.js @@ -272,10 +272,16 @@ api.invite = function(req, res, next) { } function sendInvite (){ - //req.body.type in 'guild', 'party' - invite.invitations.party = {id:group._id, name: group.name} + if(group.type = 'guild'){ + if(!invite.invitations.guilds) invite.invitations.guilds = [] //necessary + invite.invitations.guilds.push({id: group._id, name: group.name}); + }else{ + //req.body.type in 'guild', 'party' + invite.invitations.party = {id: group._id, name: group.name} + } + invite.save(); - Group.findById(group._id) + group .populate('members', partyFields).exec(function(err, saved){ res.json(saved); }); diff --git a/views/options/groups/index.jade b/views/options/groups/index.jade index 31c8745f7d..435fa3d530 100644 --- a/views/options/groups/index.jade +++ b/views/options/groups/index.jade @@ -17,7 +17,7 @@ ul.nav.nav-tabs // {#with _user.invitations.party as :party} h2 You're Invited To {{user.invitations.party.name}} a.btn.btn-success(data-type='party', ng-click='join(user.invitations.party)') Accept - a.btn.btn-danger(ng-click='reject(group)') Reject + a.btn.btn-danger(ng-click='reject()') Reject // {/} div(ng-hide='user.invitations.party', ng-controller='PartyCtrl') h2 Create A Party @@ -40,7 +40,7 @@ ul.nav.nav-tabs div(ng-repeat='invitation in user.invitations.guilds') h3 You're Invited To {{invitation.name}} a.btn.btn-success(data-type='guild', ng-click='join(group)') Accept - a.btn.btn-danger(x-bind='click:rejectInvitation') Reject + a.btn.btn-danger(ng-click='reject(invitation)') Reject // Public Groups .options-group.option-large.whatever-options input.option-content(type='text',ng-model='guildSearch', placeholder='Search')