From 8f758120d927779b6fbd5485dc1fe3949ef304b0 Mon Sep 17 00:00:00 2001
From: kunw <kunw@vmware.com>
Date: Tue, 25 Oct 2016 11:39:04 +0800
Subject: [PATCH 1/2] Fixed toggling admin options.

---
 .../components/user/toggle-admin.directive.js | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/ui/static/resources/js/components/user/toggle-admin.directive.js b/src/ui/static/resources/js/components/user/toggle-admin.directive.js
index c332823f5..33c3d0dc1 100644
--- a/src/ui/static/resources/js/components/user/toggle-admin.directive.js
+++ b/src/ui/static/resources/js/components/user/toggle-admin.directive.js
@@ -36,25 +36,22 @@
         .error(toggleAdminFailed);        
     }    
     
+    function toggleStatus() {
+      vm.isAdmin = !vm.isAdmin;
+      vm.enabled = vm.isAdmin ? 0 : 1;
+    }
+    
     function toggleAdminSuccess(data, status) {
-      if(vm.isAdmin) {
-        vm.isAdmin = false;
-      }else{
-        vm.isAdmin = true;
-      }
       console.log('Toggled userId:' + vm.userId + ' to admin:' + vm.isAdmin);
+      toggleStatus();
     }
 
     function toggleAdminFailed(data, status) {
+      console.log('Failed to toggle admin:' + data);
+      toggleStatus();
       $scope.$emit('modalTitle', $filter('tr')('error'));
       $scope.$emit('modalMessage', $filter('tr')('failed_to_toggle_admin'));
       $scope.$emit('raiseError', true);
-      if(vm.isAdmin) {
-        vm.isAdmin = false;
-      }else{
-        vm.isAdmin = true;
-      }
-      console.log('Failed to toggle admin:' + data);
     }    
   }
   

From 070cc30c8363747ccf5be4450ef4e2f59e1f97b3 Mon Sep 17 00:00:00 2001
From: kunw <kunw@vmware.com>
Date: Tue, 25 Oct 2016 13:39:22 +0800
Subject: [PATCH 2/2] Updates for changing admin options.

---
 .../js/components/user/toggle-admin.directive.js   | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/ui/static/resources/js/components/user/toggle-admin.directive.js b/src/ui/static/resources/js/components/user/toggle-admin.directive.js
index 33c3d0dc1..b4d3845ab 100644
--- a/src/ui/static/resources/js/components/user/toggle-admin.directive.js
+++ b/src/ui/static/resources/js/components/user/toggle-admin.directive.js
@@ -26,29 +26,23 @@
     var vm = this;
     
     vm.isAdmin = (vm.hasAdminRole === 1);
-    vm.enabled = vm.isAdmin ? 0 : 1;
     vm.toggle = toggle;
     vm.editable = (vm.currentUser.user_id !== Number(vm.userId));
     
     function toggle() {
-      ToggleAdminService(vm.userId, vm.enabled)
+      ToggleAdminService(vm.userId, vm.isAdmin ? 0 : 1)
         .success(toggleAdminSuccess)
         .error(toggleAdminFailed);        
     }    
-    
-    function toggleStatus() {
-      vm.isAdmin = !vm.isAdmin;
-      vm.enabled = vm.isAdmin ? 0 : 1;
-    }
-    
+     
     function toggleAdminSuccess(data, status) {
       console.log('Toggled userId:' + vm.userId + ' to admin:' + vm.isAdmin);
-      toggleStatus();
+      vm.isAdmin = !vm.isAdmin;
     }
 
     function toggleAdminFailed(data, status) {
       console.log('Failed to toggle admin:' + data);
-      toggleStatus();
+      vm.isAdmin = !vm.isAdmin;
       $scope.$emit('modalTitle', $filter('tr')('error'));
       $scope.$emit('modalMessage', $filter('tr')('failed_to_toggle_admin'));
       $scope.$emit('raiseError', true);