From efaa24fb51ba33ede4543709a134e2dffac02f85 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Fri, 16 Jun 2017 14:03:06 +0200
Subject: [PATCH] add UI feedback when enabling/disabling user

---
 .../src/views/users/user.controller.js        | 26 +++++++++++++++++++
 .../src/views/users/user.html                 |  4 +--
 .../umbraco/config/lang/en_us.xml             |  5 ++++
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
index 8ddf4461dd..2d28ee8cd8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
@@ -174,10 +174,23 @@
             vm.disableUserButtonState = "busy";
             usersResource.disableUsers([vm.user.id]).then(function (data) {
                 if (data === "true") {
+                    vm.user.userState = 1;
+                    setUserDisplayState();
                     vm.disableUserButtonState = "success";
+                    localizationService.localize("speechBubbles_disableUserSuccess", [vm.user.name]).then(function (value) {
+                        notificationsService.success(value);
+                    });
                 } else {
                     vm.disableUserButtonState = "error";
+                    localizationService.localize("speechBubbles_disableUserError").then(function (value) {
+                        notificationsService.error(value);
+                    });
                 }
+            }, function(error){
+                vm.disableUserButtonState = "error";
+                localizationService.localize("speechBubbles_disableUserError").then(function (value) {
+                    notificationsService.error(value);
+                });
             });
         }
 
@@ -185,10 +198,23 @@
             vm.enableUserButtonState = "busy";
             usersResource.enableUsers([vm.user.id]).then(function (data) {
                 if (data === "true") {
+                    vm.user.userState = 0;
+                    setUserDisplayState();
                     vm.enableUserButtonState = "success";
+                    localizationService.localize("speechBubbles_enableUserSuccess", [vm.user.name]).then(function (value) {
+                        notificationsService.success(value);
+                    });
                 } else {
                     vm.enableUserButtonState = "error";
+                    localizationService.localize("speechBubbles_enableUserError").then(function (value) {
+                        notificationsService.error(value);
+                    });
                 }
+            }, function(error){
+                vm.disableUserButtonState = "error";
+                localizationService.localize("speechBubbles_enableUserError").then(function (value) {
+                    notificationsService.error(value);
+                });
             });
         }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.html b/src/Umbraco.Web.UI.Client/src/views/users/user.html
index c9e60a2965..517dde209d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/user.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/user.html
@@ -154,7 +154,6 @@
                                     
                                 </div>
 
-                                <!--
                                 <div class="umb-package-details__information-item">
                                     <div class="umb-package-details__information-item-label">Status</div>
                                     <div class="umb-package-details__information-item-content">
@@ -166,7 +165,6 @@
                                         </umb-badge>
                                     </div>
                                 </div>
-                                -->
 
                                 <div class="umb-package-details__information-item">
                                     <div class="umb-package-details__information-item-label">Last login:</div>
@@ -201,7 +199,7 @@
 
                                     <div style="margin-bottom: 10px;">
                                         <umb-button
-                                            ng-if="vm.user.userDisplayState.alias === 'disabled'"
+                                            ng-if="vm.user.userDisplayState.alias === 'disabled' || vm.user.userDisplayState.alias === 'lockedOut'"
                                             type="button"
                                             button-style="[success,block]"
                                             state="vm.enableUserButtonState"
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index 6e04a7d3d7..ae79b88f3a 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -1034,6 +1034,11 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="scriptErrorHeader">Script view not saved</key>
     <key alias="scriptErrorText">An error occurred saving the file.</key>
     <key alias="cssErrorText">An error occurred saving the file.</key>
+    <key alias="enableUserSuccess">%0% is now enabled </key>
+    <key alias="enableUserError">An error occurred while enabling the user</key>
+    <key alias="disableUserSuccess">%0% is now disabled</key>
+    <key alias="disableUserError">An error occurred while disabling the user</key>
+
   </area>
   <area alias="stylesheet">
     <key alias="aliasHelp">Uses CSS syntax ex: h1, .redHeader, .blueTex</key>