minor,kylin acl debug (#2876) * minor,kylin acl debug resove conflict
* minor,kylin remove console Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/0994a57b Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/0994a57b Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/0994a57b Branch: refs/heads/2.2.x Commit: 0994a57b922854ad63bb79cbae77d1ea44c3824d Parents: a65c384 Author: luguosheng1314 <550175...@qq.com> Authored: Tue Oct 24 02:59:52 2017 -0500 Committer: GitHub <nore...@github.com> Committed: Tue Oct 24 02:59:52 2017 -0500 ---------------------------------------------------------------------- webapp/app/js/controllers/models.js | 2 +- webapp/app/js/listeners.js | 10 +++++++--- webapp/app/partials/common/access.html | 12 ++++++------ webapp/app/partials/cubes/cubes.html | 6 +++--- 4 files changed, 17 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/0994a57b/webapp/app/js/controllers/models.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/models.js b/webapp/app/js/controllers/models.js index 1cc0c84..ba7e3f6 100644 --- a/webapp/app/js/controllers/models.js +++ b/webapp/app/js/controllers/models.js @@ -132,7 +132,7 @@ KylinApp.controller('ModelsCtrl', function ($scope, $q, $routeParams, $location, var modelstate=false; var i=0; - CubeService.list({modelName:model.name}, function (_cubes) { + CubeService.list({modelName:model.name,projectName:$scope.projectModel.selectedProject}, function (_cubes) { model.cubes = _cubes; if (model.cubes.length != 0) { http://git-wip-us.apache.org/repos/asf/kylin/blob/0994a57b/webapp/app/js/listeners.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/listeners.js b/webapp/app/js/listeners.js index 959cfca..9d9d473 100644 --- a/webapp/app/js/listeners.js +++ b/webapp/app/js/listeners.js @@ -17,14 +17,18 @@ */ KylinApp.run(function ($rootScope, $http, $location, UserService, AuthenticationService, MessageService, $cookieStore, ProjectService, ProjectModel, AccessService, SweetAlert, loadingRequest) { - $rootScope.permissions = { READ: {name: 'QUERY', value: 'READ', mask: 1}, - MANAGEMENT: {name: 'EDIT', value: 'MANAGEMENT', mask: 32}, + MANAGEMENT: {name: 'MANAGEMENT', value: 'MANAGEMENT', mask: 32}, OPERATION: {name: 'OPERATION', value: 'OPERATION', mask: 64}, ADMINISTRATION: {name: 'ADMIN', value: 'ADMINISTRATION', mask: 16} }; - + $rootScope.permissionsSorted = [ + {name: 'QUERY', value: 'READ', mask: 1}, + {name: 'OPERATION', value: 'OPERATION', mask: 64}, + {name: 'MANAGEMENT', value: 'MANAGEMENT', mask: 32}, + {name: 'ADMIN', value: 'ADMINISTRATION', mask: 16} + ]; $rootScope.$on("$routeChangeStart", function () { AuthenticationService.ping(function (data) { UserService.setCurUser(data); http://git-wip-us.apache.org/repos/asf/kylin/blob/0994a57b/webapp/app/partials/common/access.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/common/access.html b/webapp/app/partials/common/access.html index ee41e64..9f8d6a5 100644 --- a/webapp/app/partials/common/access.html +++ b/webapp/app/partials/common/access.html @@ -50,7 +50,7 @@ <td > <label><b>Permission </b> </label> <select ng-model="newAccess.permission" ng-init="newAccess.permission=permissions.READ.value" - ng-options="permission.value as permission.name for (name, permission) in permissions"> + ng-options="permission.value as permission.name for (name, permission) in permissionsSorted"> <option value=""></option> </select> </td> @@ -87,14 +87,14 @@ <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 == 32">EDIT</span> - <span ng-if="accessEntity.permission.mask == 64">OPERATION</span> - <span ng-if="accessEntity.permission.mask == 16">ADMIN</span> + <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> </td> <td ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission('project',entity, 16)"> <select ng-model="accessEntity.newPermission" ng-init="newAccess.permission=permissions.READ.value" - ng-options="permission.value as permission.name for (name, permission) in permissions"> + ng-options="permission.value as permission.name for (name, permission) in permissionsSorted"> <option value="">-- select access --</option> </select> <button class="btn btn-default btn-xs" ng-disabled="!accessEntity.newPermission" http://git-wip-us.apache.org/repos/asf/kylin/blob/0994a57b/webapp/app/partials/cubes/cubes.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/cubes/cubes.html b/webapp/app/partials/cubes/cubes.html index 8528968..38c9342 100644 --- a/webapp/app/partials/cubes/cubes.html +++ b/webapp/app/partials/cubes/cubes.html @@ -53,7 +53,7 @@ class="fa fa-sort-desc"></i> </th> <th>Actions</th> - <th ng-if="userService.hasRole('ROLE_ADMIN')">Admins</th> + <th>Admins</th> </tr> </thead> <!--Body--> @@ -106,8 +106,8 @@ </ul> </div> </td> - <td ng-if="userService.hasRole('ROLE_ADMIN')"> - <div ng-click="$event.stopPropagation();" class="btn-group"> + <td > + <div ng-click="$event.stopPropagation();" class="btn-group" ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission('cube',cube, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask)"> <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>
