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

remove need to refresh after having accepted party invite

Browse Source
This commit is contained in:
Matteo Pagliazzi
2013-10-28 16:21:53 +01:00
parent cd97cc1e24
commit e8173a4962
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/js/controllers/groupsCtrl.js
View File

@@ -173,7 +173,8 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Groups', '$http', 'A
$scope.join = function(party){ $scope.join = function(party){
var group = new Groups.Group({_id: party.id, name: party.name}); var group = new Groups.Group({_id: party.id, name: party.name});
// there a better way to access GroupsCtrl.groups.party? // there a better way to access GroupsCtrl.groups.party?
Groups.groups.party = group.$join(function(){ group.$join(function(party){
$scope.group = party;
User.user.invitations.party = undefined; User.user.invitations.party = undefined;
}); });
} }

4
src/controllers/groups.js
View File

@@ -247,6 +247,10 @@ api.join = function(req, res, next) {
} }
], function(err, results){ ], function(err, results){
if (err) return res.json(500,{err:err}); if (err) return res.json(500,{err:err});
// Remove self from party (see above failing `match` directive in `populate`
if(results[1].type == 'party') removeSelf(results[1], user);
res.json(results[1]); res.json(results[1]);
}); });
} }