Repository: kylin Updated Branches: refs/heads/master 0bc067771 -> ce76ed9df
KYLIN-3243 Signed-off-by: chenzhx <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/56ec6af4 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/56ec6af4 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/56ec6af4 Branch: refs/heads/master Commit: 56ec6af45c2a6f407e04f03eb08d986fb9770278 Parents: 0bc0677 Author: xingpeng1 <[email protected]> Authored: Tue Feb 6 16:13:25 2018 +0800 Committer: chenzhx <[email protected]> Committed: Thu Feb 8 14:24:28 2018 +0800 ---------------------------------------------------------------------- webapp/app/partials/common/access.html | 18 +++++++++--------- webapp/app/partials/cubes/cube_detail.html | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/56ec6af4/webapp/app/partials/common/access.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/common/access.html b/webapp/app/partials/common/access.html index 9f8d6a5..ff54ed9 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> http://git-wip-us.apache.org/repos/asf/kylin/blob/56ec6af4/webapp/app/partials/cubes/cube_detail.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/cubes/cube_detail.html b/webapp/app/partials/cubes/cube_detail.html index db1a874..9443950 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':''}}"
