You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by bi...@apache.org on 2017/06/08 11:14:13 UTC
kylin git commit: KYLIN-2661 Cube list page has some minor problems
when using MODELER or ANALYST users.
Repository: kylin
Updated Branches:
refs/heads/master 1c4a939e7 -> 07f0c99f9
KYLIN-2661 Cube list page has some minor problems when using MODELER or ANALYST users.
Signed-off-by: Billy Liu <bi...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/07f0c99f
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/07f0c99f
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/07f0c99f
Branch: refs/heads/master
Commit: 07f0c99f90fa028c254a7e2d91e3f286faff4536
Parents: 1c4a939
Author: 10069681 <pe...@zte.com.cn>
Authored: Thu Jun 8 18:10:29 2017 +0800
Committer: Billy Liu <bi...@apache.org>
Committed: Thu Jun 8 19:13:57 2017 +0800
----------------------------------------------------------------------
webapp/app/partials/cubes/cubes.html | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/07f0c99f/webapp/app/partials/cubes/cubes.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubes/cubes.html b/webapp/app/partials/cubes/cubes.html
index 7fc3adb..d43b857 100644
--- a/webapp/app/partials/cubes/cubes.html
+++ b/webapp/app/partials/cubes/cubes.html
@@ -101,17 +101,17 @@
<li ng-if="cube.status!='DESCBROKEN'"><a ng-click="cloneCube(cube)">Clone</a></li>
</ul>
+ <ul ng-if="!(userService.hasRole('ROLE_ADMIN') || hasPermission(cube, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask, permissions.OPERATION.mask))" class="dropdown-menu" role="menu">
+ <li><a>N/A</a></li>
+ </ul>
</div>
- <span ng-if="!(userService.hasRole('ROLE_ADMIN') || hasPermission(cube, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask, permissions.OPERATION.mask))">
- N/A
- </span>
</td>
- <td>
+ <td ng-if="userService.hasRole('ROLE_ADMIN')">
<div ng-click="$event.stopPropagation();" class="btn-group">
<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" ng-click="listAccess(cube, 'CubeInstance')">
Action <span class="ace-icon fa fa-caret-down icon-on-right"></span>
</button>
- <ul class="dropdown-menu" role="menu" ng-if="userService.hasRole('ROLE_ADMIN')">
+ <ul class="dropdown-menu" role="menu">
<li ng-if="cube.status!='READY'"><a href="cubes/edit/{{cube.name}}/descriptionjson">Edit CubeDesc</a></li>
<li><a href="cubes/view/{{cube.name}}/instancejson">View Cube</a></li>
</ul>