From 82f6598aa384843fe201a104160fe5b5c8093273 Mon Sep 17 00:00:00 2001
From: kunw <kunw@vmware.com>
Date: Mon, 8 Aug 2016 17:31:57 +0800
Subject: [PATCH] updates for toggling project publicity and block user remove
 admin role with himself.

---
 .../js/components/project/publicity-button.directive.html   | 4 ++--
 .../resources/js/components/user/list-user.directive.html   | 4 ++--
 static/resources/js/components/user/list-user.directive.js  | 6 ++++--
 .../js/components/user/toggle-admin.directive.html          | 2 +-
 .../resources/js/components/user/toggle-admin.directive.js  | 4 +++-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/static/resources/js/components/project/publicity-button.directive.html b/static/resources/js/components/project/publicity-button.directive.html
index 62460d3db..05a4688b0 100644
--- a/static/resources/js/components/project/publicity-button.directive.html
+++ b/static/resources/js/components/project/publicity-button.directive.html
@@ -12,5 +12,5 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<button ng-if="vm.isPublic" ng-disabled="!vm.owned" class="btn btn-success" ng-click="vm.toggle()">// 'button_on' | tr //</button>
-<button ng-if="!vm.isPublic" ng-disabled="!vm.owned" class="btn btn-danger" ng-click="vm.toggle()">// 'button_off' | tr //</button>
\ No newline at end of file
+<button ng-if="vm.isPublic" class="btn btn-success" ng-click="vm.toggle()">// 'button_on' | tr //</button>
+<button ng-if="!vm.isPublic" class="btn btn-danger" ng-click="vm.toggle()">// 'button_off' | tr //</button>
\ No newline at end of file
diff --git a/static/resources/js/components/user/list-user.directive.html b/static/resources/js/components/user/list-user.directive.html
index 705ca4441..31e540295 100644
--- a/static/resources/js/components/user/list-user.directive.html
+++ b/static/resources/js/components/user/list-user.directive.html
@@ -44,10 +44,10 @@
                 <td width="20%">//u.email//</td>
                 <td width="35%">//u.creation_time | dateL : 'YYYY-MM-DD HH:mm:ss'//</td>
                 <td width="15%">
-                  <toggle-admin has-admin-role="u.has_admin_role" user-id="//u.user_id//"></toggle-admin>
+                  <toggle-admin current-user="vm.currentUser" has-admin-role="u.has_admin_role" user-id="//u.user_id//"></toggle-admin>
                 </td>
                 <td width="20%">
-                  &nbsp;&nbsp;<a href="javascript:void(0)" ng-click="vm.confirmToDelete(u.user_id, u.username)"><span class="glyphicon glyphicon-trash"></span></a>
+                  &nbsp;&nbsp;<a ng-if="vm.currentUser.user_id != u.user_id" href="javascript:void(0)" ng-click="vm.confirmToDelete(u.user_id, u.username)"><span class="glyphicon glyphicon-trash"></span></a>
                 </td>
               </tr>
             </tbody>
diff --git a/static/resources/js/components/user/list-user.directive.js b/static/resources/js/components/user/list-user.directive.js
index 1e9d42ec2..18cd60a2c 100644
--- a/static/resources/js/components/user/list-user.directive.js
+++ b/static/resources/js/components/user/list-user.directive.js
@@ -20,9 +20,9 @@
     .module('harbor.user')
     .directive('listUser', listUser);
     
-  ListUserController.$inject = ['$scope', 'ListUserService', 'DeleteUserService', '$filter', 'trFilter'];
+  ListUserController.$inject = ['$scope', 'ListUserService', 'DeleteUserService', 'currentUser', '$filter', 'trFilter'];
   
-  function ListUserController($scope, ListUserService, DeleteUserService, $filter, $trFilter) {
+  function ListUserController($scope, ListUserService, DeleteUserService, currentUser, $filter, $trFilter) {
 
     $scope.subsSubPane = 226;
         
@@ -33,6 +33,8 @@
     vm.deleteUser = deleteUser;
     vm.confirmToDelete = confirmToDelete;
     vm.retrieve = retrieve;
+
+    vm.currentUser = currentUser.get();
     
     vm.retrieve();
     
diff --git a/static/resources/js/components/user/toggle-admin.directive.html b/static/resources/js/components/user/toggle-admin.directive.html
index 5c43a9d19..dfaf86cf7 100644
--- a/static/resources/js/components/user/toggle-admin.directive.html
+++ b/static/resources/js/components/user/toggle-admin.directive.html
@@ -12,5 +12,5 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<button ng-show="vm.isAdmin" class="btn btn-success" ng-click="vm.toggle()">// 'button_on' | tr //</button>
+<button ng-show="vm.isAdmin" ng-disabled="!vm.editable" class="btn btn-success" ng-click="vm.toggle()">// 'button_on' | tr //</button>
 <button ng-show="!vm.isAdmin" class="btn btn-danger" ng-click="vm.toggle()">// 'button_off' | tr //</button>
\ No newline at end of file
diff --git a/static/resources/js/components/user/toggle-admin.directive.js b/static/resources/js/components/user/toggle-admin.directive.js
index 718a6888e..c4c90c257 100644
--- a/static/resources/js/components/user/toggle-admin.directive.js
+++ b/static/resources/js/components/user/toggle-admin.directive.js
@@ -28,6 +28,7 @@
     vm.isAdmin = (vm.hasAdminRole === 1);
     vm.enabled = vm.isAdmin ? 0 : 1;
     vm.toggle = toggle;
+    vm.editable = (vm.currentUser.user_id != vm.userId);
     
     function toggle() {
       ToggleAdminService(vm.userId, vm.enabled)
@@ -63,7 +64,8 @@
       'templateUrl': '/static/resources/js/components/user/toggle-admin.directive.html',
       'scope': {
         'hasAdminRole': '=',
-        'userId': '@'
+        'userId': '@',
+        'currentUser': '='
       },
       'link': link,
       'controller': ToggleAdminController,