Repository: kylin Updated Branches: refs/heads/master 6e4c5af68 -> c1c336d65
remove cube access set and change some project access tips Signed-off-by: lidongsjtu <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/c1c336d6 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/c1c336d6 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/c1c336d6 Branch: refs/heads/master Commit: c1c336d65abfe127b3b763ec9b910e1684aa7916 Parents: 6e4c5af Author: luguosheng1314 <[email protected]> Authored: Thu Oct 12 17:53:43 2017 +0800 Committer: lidongsjtu <[email protected]> Committed: Thu Oct 12 18:05:14 2017 +0800 ---------------------------------------------------------------------- webapp/app/js/controllers/access.js | 10 +++++----- webapp/app/js/listeners.js | 8 ++++---- webapp/app/partials/common/access.html | 8 ++++---- webapp/app/partials/cubes/cube_detail.html | 26 ++++++++++++------------- 4 files changed, 26 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/c1c336d6/webapp/app/js/controllers/access.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/access.js b/webapp/app/js/controllers/access.js index 418843a..d46e09d 100644 --- a/webapp/app/js/controllers/access.js +++ b/webapp/app/js/controllers/access.js @@ -21,11 +21,11 @@ KylinApp.controller('AccessCtrl', function ($scope, AccessService, MessageService, AuthenticationService, SweetAlert) { $scope.accessTooltip = "<div style='text-align: left'>" + - "<label>What does access mean to cube?</label>" + - "<ul><li>CUBE QUERY: Access to query cube</li>" + - "<li>CUBE OPERATION: Access to rebuild, resume and cancel jobs. Also include access of CUBE QUERY.</li>" + - "<li>CUBE MANAGEMENT: Access to edit/delete cube. Also include access of CUBE OPERATION.</li>" + - "<li>CUBE ADMIN: Full access to cube and jobs, including access management.</li></ul></div>"; + "<label>What does access mean to project?</label>" + + "<ul><li>QUERY: Access to query cube</li>" + + "<li>OPERATION: Access to rebuild, resume and cancel jobs. Also include access of CUBE QUERY.</li>" + + "<li>MANAGEMENT: Access to edit/delete cube. Also include access of CUBE OPERATION.</li>" + + "<li>ADMIN: Full access to cube and jobs, including access management.</li></ul></div>"; $scope.authorities = null; AuthenticationService.authorities({}, function (authorities) { http://git-wip-us.apache.org/repos/asf/kylin/blob/c1c336d6/webapp/app/js/listeners.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/listeners.js b/webapp/app/js/listeners.js index e5c40fb..959cfca 100644 --- a/webapp/app/js/listeners.js +++ b/webapp/app/js/listeners.js @@ -19,10 +19,10 @@ KylinApp.run(function ($rootScope, $http, $location, UserService, AuthenticationService, MessageService, $cookieStore, ProjectService, ProjectModel, AccessService, SweetAlert, loadingRequest) { $rootScope.permissions = { - READ: {name: 'CUBE QUERY', value: 'READ', mask: 1}, - MANAGEMENT: {name: 'CUBE EDIT', value: 'MANAGEMENT', mask: 32}, - OPERATION: {name: 'CUBE OPERATION', value: 'OPERATION', mask: 64}, - ADMINISTRATION: {name: 'CUBE ADMIN', value: 'ADMINISTRATION', mask: 16} + READ: {name: 'QUERY', value: 'READ', mask: 1}, + MANAGEMENT: {name: 'EDIT', value: 'MANAGEMENT', mask: 32}, + OPERATION: {name: 'OPERATION', value: 'OPERATION', mask: 64}, + ADMINISTRATION: {name: 'ADMIN', value: 'ADMINISTRATION', mask: 16} }; $rootScope.$on("$routeChangeStart", function () { http://git-wip-us.apache.org/repos/asf/kylin/blob/c1c336d6/webapp/app/partials/common/access.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/common/access.html b/webapp/app/partials/common/access.html index 74f8c9f..be0a9d0 100644 --- a/webapp/app/partials/common/access.html +++ b/webapp/app/partials/common/access.html @@ -87,10 +87,10 @@ <span ng-if="accessEntity.sid.grantedAuthority">Role</span> </td> <td> - <span ng-if="accessEntity.permission.mask == 1">CUBE QUERY</span> - <span ng-if="accessEntity.permission.mask == 32">CUBE EDIT</span> - <span ng-if="accessEntity.permission.mask == 64">CUBE OPERATION</span> - <span ng-if="accessEntity.permission.mask == 16">CUBE ADMIN</span> + <span ng-if="accessEntity.permission.mask == 1">QUERY</span> + <span ng-if="accessEntity.permission.mask == 32">EDIT</span> + <span ng-if="accessEntity.permission.mask == 64">OPERATION</span> + <span ng-if="accessEntity.permission.mask == 16">ADMIN</span> </td> <td ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission(entity, 16)"> <select ng-model="accessEntity.newPermission" ng-init="newAccess.permission=permissions.READ.value" http://git-wip-us.apache.org/repos/asf/kylin/blob/c1c336d6/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 51f7dee..674e3f0 100755 --- a/webapp/app/partials/cubes/cube_detail.html +++ b/webapp/app/partials/cubes/cube_detail.html @@ -29,10 +29,10 @@ ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission(cube, 16) && !newAccess"> <a href="" ng-click="cube.visiblePage='json';">JSON(Cube)</a> </li> - <li class="{{cube.visiblePage=='access'? 'active':''}}" - ng-if="!kylinConfig.isExternalAclEnabled()"> - <a href="" ng-click="cube.visiblePage='access';listAccess(cube, 'CubeInstance');">Access</a> - </li> + <!--<li class="{{cube.visiblePage=='access'? 'active':''}}"--> + <!--ng-if="!kylinConfig.isExternalAclEnabled()">--> + <!--<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, 16) && !newAccess"> <a href="" ng-click="cube.visiblePage='notification';getNotifyListString(cube);">Notification</a> @@ -69,15 +69,15 @@ <!--<div ng-show="cube.visiblePage=='graph'" id="cube_graph_{{cube.name}}" class="cube-detail cube_graph">--> <!--</div>--> - <div class="cube-detail" ng-if="cube.visiblePage=='access'"> - <div class="row"> - <div class="col-xs-1"></div> - <div class="col-xs-10"> - <div ng-include src="'partials/common/access.html'" ng-init="entity=cube;type='CubeInstance';"></div> - </div> - <div class="col-xs-1"></div> - </div> - </div> + <!--<div class="cube-detail" ng-if="cube.visiblePage=='access'">--> + <!--<div class="row">--> + <!--<div class="col-xs-1"></div>--> + <!--<div class="col-xs-10">--> + <!--<div ng-include src="'partials/common/access.html'" ng-init="entity=cube;type='CubeInstance';"></div>--> + <!--</div>--> + <!--<div class="col-xs-1"></div>--> + <!--</div>--> + <!--</div>--> <div class="cube-detail" ng-show="cube.visiblePage=='notification'"> <div style="margin: 15px;">
