krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(client): Allow users to reject invites to new parties

Browse Source 
closes #7691
This commit is contained in:
Blade Barringer
2016-06-18 20:21:00 -05:00
parent 813aa2cf38
commit e28946bcfb
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
website/client/js/controllers/partyCtrl.js
View File

@@ -152,8 +152,9 @@ habitrpg.controller("PartyCtrl", ['$rootScope','$scope','Groups','Chat','User','
} }
$scope.reject = function(party) { $scope.reject = function(party) {
Groups.Group.rejectInvite(party.id); Groups.Group.rejectInvite(party.id).then(function () {
User.set({'invitations.party':{}}); User.sync();
});
} }
$scope.questInit = function() { $scope.questInit = function() {

2
website/views/options/social/party/leave-party-and-join-another.jade
View File

@@ -5,4 +5,4 @@
p {{::env.t('invitedToNewParty', { partyName: #{newParty}.name })}} p {{::env.t('invitedToNewParty', { partyName: #{newParty}.name })}}
p p
button.btn.btn-success(ng-click='leaveOldPartyAndJoinNewParty(#{newParty}.id, #{newParty}.name)')=env.t('joinNewParty') button.btn.btn-success(ng-click='leaveOldPartyAndJoinNewParty(#{newParty}.id, #{newParty}.name)')=env.t('joinNewParty')
button.btn.btn-default(ng-click='reject()')=env.t('declineInvitation') button.btn.btn-default(ng-click='reject(#{newParty})')=env.t('declineInvitation')