From e61800df234a62e6969b084eb4a3c2c8e5f7c3c5 Mon Sep 17 00:00:00 2001
From: xingpeng1 <xing.peng1@zte.com.cn>
Date: Tue, 6 Feb 2018 16:13:25 +0800
Subject: [PATCH 1/1] KYLIN-3243

---
 webapp/app/partials/common/access.html     | 18 +++++++++---------
 webapp/app/partials/cubes/cube_detail.html |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/webapp/app/partials/common/access.html b/webapp/app/partials/common/access.html
index 9f8d6a5f0..ff54ed9b1 100644
--- a/webapp/app/partials/common/access.html
+++ b/webapp/app/partials/common/access.html
@@ -19,7 +19,7 @@
 <div ng-controller="AccessCtrl">
     <div class="space-4"></div>
     <div class="pull-right">
-        <button class="btn btn-primary btn-xs" ng-click="renewAccess(entity)" ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission('project',entity, 16) && !newAccess"><i
+        <button class="btn btn-primary btn-xs" ng-click="renewAccess(entity)" ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission('project',entity, permissions.ADMINISTRATION.mask) && !newAccess"><i
                 class="fa fa-plus"></i> Grant
         </button>
         <button class="btn btn-primary btn-xs" ng-click="resetNewAcess()" ng-if="newAccess"><i
@@ -72,8 +72,8 @@
                 <th>Name</th>
                 <th>Type</th>
                 <th>Access</th>
-                <th ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission('project',entity, 16)">Update</th>
-                <th ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission('project',entity, 16)">Revoke</th>
+                <th ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission('project',entity, permissions.ADMINISTRATION.mask)">Update</th>
+                <th ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission('project',entity, permissions.ADMINISTRATION.mask)">Revoke</th>
             </tr>
         </thead>
         <tbody>
@@ -87,12 +87,12 @@
                     <span ng-if="accessEntity.sid.grantedAuthority">Role</span>
                 </td>
                 <td>
-                  <span ng-if="accessEntity.permission.mask == 1">QUERY</span>
-                  <span ng-if="accessEntity.permission.mask == 64">OPERATION</span>
-                  <span ng-if="accessEntity.permission.mask == 32">MANAGEMENT</span>
-                  <span ng-if="accessEntity.permission.mask == 16">ADMIN</span>
+                  <span ng-if="accessEntity.permission.mask == permissions.READ.mask">QUERY</span>
+                  <span ng-if="accessEntity.permission.mask == permissions.OPERATION.mask">OPERATION</span>
+                  <span ng-if="accessEntity.permission.mask == permissions.MANAGEMENT.mask">MANAGEMENT</span>
+                  <span ng-if="accessEntity.permission.mask == permissions.ADMINISTRATION.mask">ADMIN</span>
                 </td>
-                <td ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission('project',entity, 16)">
+                <td ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission('project',entity, permissions.ADMINISTRATION.mask)">
                     <select ng-model="accessEntity.newPermission"  ng-init="newAccess.permission=permissions.READ.value"
                             ng-options="permission.value as permission.name for (name, permission) in permissionsSorted">
                         <option value="">-- select access --</option>
@@ -101,7 +101,7 @@
                             ng-click="update(type, entity, accessEntity, accessEntity.newPermission)">Update
                     </button>
                 </td>
-                <td ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission('project',entity, 16)">
+                <td ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission('project',entity, permissions.ADMINISTRATION.mask)">
                     <button class="btn btn-default btn-xs" ng-click="revoke(type, accessEntity, entity)">Revoke</button>
                 </td>
             </tr>
diff --git a/webapp/app/partials/cubes/cube_detail.html b/webapp/app/partials/cubes/cube_detail.html
index db1a87419..94439502c 100755
--- a/webapp/app/partials/cubes/cube_detail.html
+++ b/webapp/app/partials/cubes/cube_detail.html
@@ -26,7 +26,7 @@
             <a href="" ng-click="cube.visiblePage='sql';getCubeSql(cube)">SQL</a>
         </li>
         <li class="{{cube.visiblePage=='json'? 'active':''}}"
-            ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission('cube',cube, 16) && !newAccess">
+            ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission('cube',cube, permissions.ADMINISTRATION.mask) && !newAccess">
             <a href="" ng-click="cube.visiblePage='json';">JSON(Cube)</a>
         </li>
         <!--<li class="{{cube.visiblePage=='access'? 'active':''}}"-->
@@ -34,7 +34,7 @@
             <!--<a href="" ng-click="cube.visiblePage='access';listAccess(cube, 'CubeInstance');">Access</a>-->
         <!--</li>-->
         <li class="{{cube.visiblePage=='notification'? 'active':''}}"
-            ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission('cube',cube, 16) && !newAccess">
+            ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission('cube',cube, permissions.ADMINISTRATION.mask) && !newAccess">
             <a href="" ng-click="cube.visiblePage='notification';getNotifyListString(cube);">Notification</a>
         </li>
         <li class="{{cube.visiblePage=='hbase'? 'active':''}}"
-- 
2.11.0.windows.1