From 15ab9dba4bda6091f82604d69eae52b0e77c4168 Mon Sep 17 00:00:00 2001
From: 10069681 <peng.jianhua@zte.com.cn>
Date: Thu, 8 Jun 2017 18:10:29 +0800
Subject: [PATCH 1/1] KYLIN-2661 Cube list page has some minor problems when
 using MODELER or ANALYST users.

---
 webapp/app/partials/cubes/cubes.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/app/partials/cubes/cubes.html b/webapp/app/partials/cubes/cubes.html
index 7fc3adb32..d43b857a8 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>
-- 
2.11.0.windows.1