Merge branch 'develop' into add-user-to-analyticsService

website/src/controllers/groups.js

@@ -211,7 +211,6 @@ api.create = function(req, res, next) {
       if (err == 'Already in a party, try refreshing.') return res.json(400,{err:err});
       if (err) return next(err);
       return res.json(populated);
-      group = user = null;
     })
   }
 }
@@ -286,7 +285,6 @@ api.postChat = function(req, res, next) {
     group.save(function(err, saved){
       if (err) return next(err);
       return chatUpdated ? res.json({chat: group.chat}) : res.json({message: saved.chat[0]});
-      group = chatUpdated = null;
     });
   }
 }
@@ -306,8 +304,7 @@ api.deleteChatMessage = function(req, res, next){
 
   Group.update({_id:group._id}, {$pull:{chat:{id: req.params.messageId}}}, function(err){
     if(err) return next(err);
-    chatUpdated ? res.json({chat: group.chat}) : res.send(204);
-    group = chatUpdated = null;
+    return chatUpdated ? res.json({chat: group.chat}) : res.send(204);
   });
 }
 
@@ -550,7 +547,6 @@ api.leave = function(req, res, next) {
   ],function(err){
     if (err) return next(err);
     return res.send(204);
-    user = group = keep = null;
   })
 }
 
@@ -787,7 +783,6 @@ api.removeMember = function(req, res, next){
     });
   }else{
     return res.json(400, {err: "User not found among group's members!"});
-    group = uuid = null;
   }
 }