From bac71559f3c7eb7f76d2143ba1bba698cb302d54 Mon Sep 17 00:00:00 2001
From: Maurice Williams <morficus@gmail.com>
Date: Sat, 2 Aug 2014 20:49:56 -0400
Subject: [PATCH] prevent revoking invite for already active users

closes #3563
- before attempting to revoke an invitation, get updated model info
- reload route and show warning if user info has changed
---
 .../admin/controllers/settings/users/user.js  | 20 ++++++++++++++-----
 ghost/admin/routes/settings/users/index.js    |  6 ++++++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/ghost/admin/controllers/settings/users/user.js b/ghost/admin/controllers/settings/users/user.js
index dc95bb5c5f..dbc1eb36ce 100644
--- a/ghost/admin/controllers/settings/users/user.js
+++ b/ghost/admin/controllers/settings/users/user.js
@@ -63,13 +63,23 @@ var SettingsUserController = Ember.ObjectController.extend({
         },
         revoke: function () {
             var self = this,
+                model = this.get('model'),
                 email = this.get('email');
 
-            this.get('model').destroyRecord().then(function () {
-                var notificationText = 'Invitation revoked. (' + email + ')';
-                self.notifications.showSuccess(notificationText, false);
-            }).catch(function (error) {
-                self.notifications.showAPIError(error);
+            //reload the model to get the most up-to-date user information
+            model.reload().then(function () {
+                if (self.get('invited')) {
+                    model.destroyRecord().then(function () {
+                        var notificationText = 'Invitation revoked. (' + email + ')';
+                        self.notifications.showSuccess(notificationText, false);
+                    }).catch(function (error) {
+                        self.notifications.showAPIError(error);
+                    });
+                } else {
+                    //if the user is no longer marked as "invited", then show a warning and reload the route
+                    self.get('target').send('reload');
+                    self.notifications.showError('This user has already accepted the invitation.', {delayed: 500});
+                }
             });
         },
 
diff --git a/ghost/admin/routes/settings/users/index.js b/ghost/admin/routes/settings/users/index.js
index 21a6c1cde1..c92aefc37e 100644
--- a/ghost/admin/routes/settings/users/index.js
+++ b/ghost/admin/routes/settings/users/index.js
@@ -26,6 +26,12 @@ var UsersIndexRoute = Ember.Route.extend(SimpleAuth.AuthenticatedRouteMixin, Pag
                 return true;
             });
         });
+    },
+
+    actions: {
+        reload: function () {
+            this.refresh();
+        }
     }
 });