From 66d16fefc3ffea39a6b5fcc5093e4489e6143510 Mon Sep 17 00:00:00 2001
From: Blade Barringer <blade@crookedneighbor.com>
Date: Mon, 24 Aug 2015 12:38:43 -0500
Subject: [PATCH] Send back 204 from questLeave route

---
 test/server_side/controllers/groups.test.js          | 9 +++++----
 website/public/js/controllers/partyCtrl.js           | 6 ++----
 website/src/controllers/groups.js                    | 2 +-
 website/views/options/social/quests/questActive.jade | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/test/server_side/controllers/groups.test.js b/test/server_side/controllers/groups.test.js
index 59fc4d0f9c..644a37ac92 100644
--- a/test/server_side/controllers/groups.test.js
+++ b/test/server_side/controllers/groups.test.js
@@ -54,7 +54,8 @@ describe('Groups Controller', function() {
           group: group,
           user: user
         },
-        json: sinon.stub()
+        json: sinon.stub(),
+        send: sinon.stub()
       };
 
       req = { };
@@ -121,11 +122,11 @@ describe('Groups Controller', function() {
         expect(group.quest.members[user._id]).to.not.exist;
       });
 
-      it('sends back 201 on success', function() {
+      it('sends back 204 on success', function() {
         groupsController.questLeave(req, res);
 
-        expect(res.json).to.be.calledOnce;
-        expect(res.json).to.be.calledWith(201);
+        expect(res.send).to.be.calledOnce;
+        expect(res.send).to.be.calledWith(204);
       });
     });
   });
diff --git a/website/public/js/controllers/partyCtrl.js b/website/public/js/controllers/partyCtrl.js
index ee183dbb0b..b7dc83e95f 100644
--- a/website/public/js/controllers/partyCtrl.js
+++ b/website/public/js/controllers/partyCtrl.js
@@ -117,10 +117,8 @@ habitrpg.controller("PartyCtrl", ['$rootScope','$scope','Groups','Chat','User','
       $scope.questLeave = function(party){
         if (!confirm(window.env.t('sureLeave'))) return;
 
-        Groups.questLeave(party)
-          .then(function() {
-            $rootScope.hardRedirect('/#/options/groups/party');
-          });
+        delete $scope.group.quest.members[User.user._id];
+        Groups.questLeave(party);
       }
 
       $scope.questAccept = function(party){
diff --git a/website/src/controllers/groups.js b/website/src/controllers/groups.js
index 2b5c8fdd69..f2b2ec3413 100644
--- a/website/src/controllers/groups.js
+++ b/website/src/controllers/groups.js
@@ -1095,6 +1095,6 @@ api.questLeave = function(req, res, next) {
 
   group.save(function(err, result) {
     if (err) return next(err);
-    return res.json(201, group);
+    return res.send(204);
   });
 }
diff --git a/website/views/options/social/quests/questActive.jade b/website/views/options/social/quests/questActive.jade
index 510eefd5a9..3f920689d4 100644
--- a/website/views/options/social/quests/questActive.jade
+++ b/website/views/options/social/quests/questActive.jade
@@ -22,5 +22,5 @@ div(ng-if='group.quest.active==true')
   unless tavern
     button.btn.btn-sm.btn-warning(ng-if=':: (group.quest.leader  && group.quest.leader==user._id && isMemberOfRunningQuest(group.quest.leader,group))',
       ng-click='questAbort(party)')=env.t('abort')
-    button.btn.btn-sm.btn-warning(ng-if=':: (group.quest.leader  && group.quest.leader!=user._id && isMemberOfRunningQuest(user._id,group))',
+    button.btn.btn-sm.btn-warning(ng-if='!(group.quest.leader && group.quest.leader === user._id) && isMemberOfRunningQuest(user._id,group)',
       ng-click='questLeave(party)')=env.t('leaveQuest')