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

Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert

Browse Source 
Conflicts:
	src/controllers/groups.js
	src/controllers/payments/index.js
	src/controllers/user.js
	src/models/user.js
This commit is contained in:
Blade Barringer
2015-02-09 22:21:27 -06:00
parent 45d1fb4c6e 24a6b2f4cc
commit 75c9b5a978
14 changed files with 2327 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/src/controllers/user.js
View File

@@ -459,7 +459,11 @@ api.sessionPartyInvite = function(req,res,next){
.select('invites members').exec(cb);
},
function(group, cb){
if (!group) return cb("Inviter not in party");
if (!group){
// Don't send error as it will prevent users from using the site
delete req.session.partyInvite;
return cb();
}
inv.party = req.session.partyInvite;
delete req.session.partyInvite;
if (!~group.invites.indexOf(res.locals.user._id))