remove access condition of modeler (#2798) * remove access condition of modeler
* kylin remove useless console Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/76040d5a Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/76040d5a Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/76040d5a Branch: refs/heads/2.2.x Commit: 76040d5acfb3c0e4e04e3de337b3807173e1fa50 Parents: 3ead3c9 Author: luguosheng1314 <550175...@qq.com> Authored: Wed Oct 18 01:33:02 2017 -0500 Committer: lidongsjtu <lid...@apache.org> Committed: Wed Oct 18 14:47:01 2017 +0800 ---------------------------------------------------------------------- webapp/app/js/controllers/page.js | 2 +- webapp/app/partials/cubes/cubes.html | 14 +++++++------- webapp/app/partials/jobs/jobs.html | 6 +++--- webapp/app/partials/models/model_schema.html | 2 +- webapp/app/partials/models/models.html | 4 ++-- webapp/app/partials/models/models_tree.html | 10 +++++----- webapp/app/partials/projects/projects.html | 6 +++--- webapp/app/partials/query/query.html | 4 ++-- webapp/app/partials/tables/source_table_tree.html | 6 +++--- webapp/app/partials/tables/table_detail.html | 6 +++--- 10 files changed, 30 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/76040d5a/webapp/app/js/controllers/page.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/page.js b/webapp/app/js/controllers/page.js index 5a77195..54cb643 100644 --- a/webapp/app/js/controllers/page.js +++ b/webapp/app/js/controllers/page.js @@ -105,7 +105,7 @@ KylinApp.controller('PageCtrl', function ($scope, $q, AccessService, $modal, $lo if (accessType === 'cube') { project = entity.project } else if (accessType === 'project') { - project = entity.name + project = entity && entity.name || entity.selectedProject } else if (accessType === 'model') { project = ProjectModel.getProjectByCubeModel(entity.name) } http://git-wip-us.apache.org/repos/asf/kylin/blob/76040d5a/webapp/app/partials/cubes/cubes.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/cubes/cubes.html b/webapp/app/partials/cubes/cubes.html index 22ab122..8528968 100644 --- a/webapp/app/partials/cubes/cubes.html +++ b/webapp/app/partials/cubes/cubes.html @@ -87,18 +87,18 @@ data-toggle="dropdown" ng-click="listAccess(cube, 'CubeInstance')"> Action <span class="ace-icon fa fa-caret-down icon-on-right"></span> </button> - <ul ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission('cube',cube, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask, permissions.OPERATION.mask)" class="dropdown-menu" role="menu"> - <li ng-if="cube.status!='READY' && userService.hasRole('ROLE_ADMIN') "> + <ul ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission('cube',cube, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask,permissions.OPERATION.mask)" class="dropdown-menu" role="menu"> + <li ng-if="cube.status!='READY' && (userService.hasRole('ROLE_ADMIN') || hasPermission('cube',cube, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask))"> <a ng-click="dropCube(cube)" tooltip="Drop the cube, related jobs and data permanently.">Drop</a></li> - <li ng-if="(userService.hasRole('ROLE_ADMIN') || hasPermission('cube',cube, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask))"> + <li ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission('cube',cube, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask)"> <a ng-click="cubeEdit(cube);">Edit</a></li> <li ng-if="cube.status!='DESCBROKEN'"><a ng-click="startJobSubmit(cube);">Build</a></li> <li ng-if="cube.status!='DESCBROKEN'"><a ng-click="startRefresh(cube)">Refresh</a></li> <li ng-if="cube.status!='DESCBROKEN'"><a ng-click="startMerge(cube)">Merge</a></li> - <li ng-if="cube.status=='READY'"><a ng-click="disable(cube)">Disable</a></li> - <li ng-if="cube.status=='DISABLED'"><a ng-click="enable(cube)">Enable</a></li> - <li ng-if="cube.status=='DISABLED'"><a ng-click="purge(cube)">Purge</a></li> - <li ng-if="cube.status!='DESCBROKEN'"><a ng-click="cloneCube(cube)">Clone</a></li> + <li ng-if="cube.status=='READY' && (userService.hasRole('ROLE_ADMIN') || hasPermission('cube',cube, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask))"><a ng-click="disable(cube)">Disable</a></li> + <li ng-if="cube.status=='DISABLED' && (userService.hasRole('ROLE_ADMIN') || hasPermission('cube',cube, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask))"><a ng-click="enable(cube)">Enable</a></li> + <li ng-if="cube.status=='DISABLED' && (userService.hasRole('ROLE_ADMIN') || hasPermission('cube',cube, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask))"><a ng-click="purge(cube)">Purge</a></li> + <li ng-if="cube.status!='DESCBROKEN' && (userService.hasRole('ROLE_ADMIN') || hasPermission('cube',cube, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask))"><a ng-click="cloneCube(cube)">Clone</a></li> </ul> <ul ng-if="!(userService.hasRole('ROLE_ADMIN') || hasPermission('cube',cube, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask, permissions.OPERATION.mask))" class="dropdown-menu" role="menu"> http://git-wip-us.apache.org/repos/asf/kylin/blob/76040d5a/webapp/app/partials/jobs/jobs.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/jobs/jobs.html b/webapp/app/partials/jobs/jobs.html index 78c2220..7c8de32 100644 --- a/webapp/app/partials/jobs/jobs.html +++ b/webapp/app/partials/jobs/jobs.html @@ -20,9 +20,9 @@ <!--Project: --> <div class="col-xs-3"> <form ng-if="userService.isAuthorized()"> - <div class="form-group" ng-if="userService.hasRole('ROLE_MODELER')" > - <a class="btn btn-xs btn-info" href="projects" tooltip="Manage Project"><i class="fa fa-gears"></i></a> - <a class="btn btn-xs btn-primary" ng-if="userService.hasRole('ROLE_MODELER')" style="width: 29px" tooltip="Add Project" ng-click="toCreateProj()"> + <div class="form-group" > + <a class="btn btn-xs btn-info" href="projects" tooltip="Manage Project"><i class="fa fa-gears"></i></a> + <a class="btn btn-xs btn-primary" ng-if="userService.hasRole('ROLE_ADMIN')" style="width: 29px" tooltip="Add Project" ng-click="toCreateProj()"> <i class="fa fa-plus"></i> </a> </div> http://git-wip-us.apache.org/repos/asf/kylin/blob/76040d5a/webapp/app/partials/models/model_schema.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/models/model_schema.html b/webapp/app/partials/models/model_schema.html index 3a332de..f265521 100644 --- a/webapp/app/partials/models/model_schema.html +++ b/webapp/app/partials/models/model_schema.html @@ -71,7 +71,7 @@ </div> <div class="box-body"> <p> - <a href="models/add" ng-if="userService.hasRole('ROLE_MODELER')">Click here to create your model</a> + <a href="models/add" ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission('project',projectModel, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask)">Click here to create your model</a> </p> </div><!-- /.box-body --> </div> http://git-wip-us.apache.org/repos/asf/kylin/blob/76040d5a/webapp/app/partials/models/models.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/models/models.html b/webapp/app/partials/models/models.html index c8e6ed1..3f75ff8 100644 --- a/webapp/app/partials/models/models.html +++ b/webapp/app/partials/models/models.html @@ -19,9 +19,9 @@ <div class="page-header" style="height: 50px;"> <!--Project--> <form class="navbar-form navbar-left" style="margin-top: 0px !important;" ng-if="userService.isAuthorized()"> - <div class="form-group" ng-if="userService.hasRole('ROLE_MODELER')" > + <div class="form-group" > <a class="btn btn-xs btn-info" href="projects" tooltip="Manage Project"><i class="fa fa-gears"></i></a> - <a class="btn btn-xs btn-primary" ng-if="userService.hasRole('ROLE_MODELER')" style="width: 29px" tooltip="Add Project" ng-click="toCreateProj()"> + <a class="btn btn-xs btn-primary" ng-if="userService.hasRole('ROLE_ADMIN')" style="width: 29px" tooltip="Add Project" ng-click="toCreateProj()"> <i class="fa fa-plus"></i> </a> </div> http://git-wip-us.apache.org/repos/asf/kylin/blob/76040d5a/webapp/app/partials/models/models_tree.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/models/models_tree.html b/webapp/app/partials/models/models_tree.html index d6d0b1a..d8aae34 100644 --- a/webapp/app/partials/models/models_tree.html +++ b/webapp/app/partials/models/models_tree.html @@ -20,15 +20,15 @@ <div class="row"> <div class="col-xs-12" style="margin-top:10px;"> <!--<i class="fa fa-plus fa-2x" style="color:green;"> New</i>--> - <a ng-if="userService.hasRole('ROLE_MODELER')" class="dropdown-toggle" data-toggle="dropdown" href="#" aria-expanded="true"> + <a ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission('project',projectModel, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask)" class="dropdown-toggle" data-toggle="dropdown" href="#" aria-expanded="true"> <i class="fa fa-plus fa-2x" style="color:#2e8965;"> New<span class="caret"></span></i> <!--<i> New </i> <span class="caret"></span>--> </a> <ul class="dropdown-menu"> - <li ng-if="userService.hasRole('ROLE_MODELER')"> - <a href="models/add"><i class="fa fa-star"></i>New Model</a> + <li ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission('project',projectModel, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask)"> + <a href="models/add"><i class="fa fa-star"></i>New Model</a> </li> - <li ng-if="userService.hasRole('ROLE_MODELER')"> + <li ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission('project',projectModel, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask)"> <a href="cubes/add"><i class="fa fa-cube"></i>New Cube</a> </li> @@ -52,7 +52,7 @@ <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" ng-click="listModelAccess(model)"> 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') || hasPermission('model',model, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask, permissions.OPERATION.mask))"> + <ul class="dropdown-menu" role="menu" ng-if="(userService.hasRole('ROLE_ADMIN') || hasPermission('model',model, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask))"> <li><a ng-click="editModel(model, false)" title="Edit Model" style="cursor:pointer;margin-right: 8px;" >Edit</a></li> <li><a ng-click="cloneModel(model)" title="Clone Model" style="cursor:pointer;margin-right: 8px;" >Clone </a></li> <li><a ng-click="dropModel(model)" title="Drop Model" style="cursor:pointer;margin-right: 8px;">Drop</a></li> http://git-wip-us.apache.org/repos/asf/kylin/blob/76040d5a/webapp/app/partials/projects/projects.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/projects/projects.html b/webapp/app/partials/projects/projects.html index 95fc359..29126ce 100644 --- a/webapp/app/partials/projects/projects.html +++ b/webapp/app/partials/projects/projects.html @@ -17,7 +17,7 @@ --> <div class="page-header"> - <button class="btn btn-primary btn-sm" ng-if="userService.hasRole('ROLE_MODELER')" ng-click="toCreateProj()"><i class="fa fa-plus"></i> Project</button> + <button class="btn btn-primary btn-sm" ng-if="userService.hasRole('ROLE_ADMIN')" ng-click="toCreateProj()"><i class="fa fa-plus"></i> Project</button> </div> <div ng-if="!loading && projects.length == 0"> @@ -58,10 +58,10 @@ <td>{{ project.create_time_utc | utcToConfigTimeZone}}</td> <td> <button class="btn btn-xs btn-info" ng-click="toEdit(project)" tooltip="Edit" - ng-disabled="!(userService.hasRole('ROLE_ADMIN') || hasPermission('project',project, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask, permissions.OPERATION.mask))"> + ng-disabled="!(userService.hasRole('ROLE_ADMIN') || hasPermission('project',project, permissions.ADMINISTRATION.mask))"> <i class="fa fa-pencil"></i></button> <button class="btn btn-xs btn-danger" ng-click="delete(project)" tooltip="Delete" - ng-disabled="!(userService.hasRole('ROLE_ADMIN') || hasPermission('project',project, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask, permissions.OPERATION.mask))" + ng-disabled="!userService.hasRole('ROLE_ADMIN')" ><i class="fa fa-trash-o"></i></button> </td> </tr> http://git-wip-us.apache.org/repos/asf/kylin/blob/76040d5a/webapp/app/partials/query/query.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/query/query.html b/webapp/app/partials/query/query.html index 5117bd8..b07ca8a 100644 --- a/webapp/app/partials/query/query.html +++ b/webapp/app/partials/query/query.html @@ -19,9 +19,9 @@ <div class="page-header" style="height: 50px;"> <!--Project--> <form class="navbar-form navbar-left" style="margin-top: 0px !important;" ng-if="userService.isAuthorized()"> - <div class="form-group" ng-if="userService.hasRole('ROLE_MODELER')"> + <div class="form-group" > <a class="btn btn-xs btn-info" href="projects" tooltip="Manage Project"><i class="fa fa-gears"></i></a> - <a class="btn btn-xs btn-primary" ng-if="userService.hasRole('ROLE_MODELER')" style="width: 29px" tooltip="Add Project" ng-click="toCreateProj()"> + <a class="btn btn-xs btn-primary" ng-if="userService.hasRole('ROLE_ADMIN')" style="width: 29px" tooltip="Add Project" ng-click="toCreateProj()"> <i class="fa fa-plus"></i> </a> </div> http://git-wip-us.apache.org/repos/asf/kylin/blob/76040d5a/webapp/app/partials/tables/source_table_tree.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/tables/source_table_tree.html b/webapp/app/partials/tables/source_table_tree.html index e8ec286..4eb63a1 100755 --- a/webapp/app/partials/tables/source_table_tree.html +++ b/webapp/app/partials/tables/source_table_tree.html @@ -25,9 +25,9 @@ <!--button--> <div class="col-xs-5" style="padding-left: 0px;margin-top: 20px;"> <div class="pull-right"> - <a class="btn btn-xs btn-primary" tooltip="Load Hive Table" ng-if="userService.hasRole('ROLE_ADMIN')" ng-click="openModal()"><i class="fa fa-download"></i></a> - <a class="btn btn-xs btn-info" tooltip="Load Hive Table From Tree" ng-if="userService.hasRole('ROLE_ADMIN')" ng-click="openTreeModal()"><i class="fa fa-download"></i></a> - <a class="btn btn-xs btn-primary" tooltip="Add Streaming Table" ng-if="userService.hasRole('ROLE_ADMIN')" ng-click="openStreamingSourceModal()"><i class="fa fa-area-chart"></i></a> + <a class="btn btn-xs btn-primary" tooltip="Load Hive Table" ng-if="userService.hasRole('ROLE_ADMIN')|| hasPermission('project',projectModel, permissions.ADMINISTRATION.mask)" ng-click="openModal()"><i class="fa fa-download"></i></a> + <a class="btn btn-xs btn-info" tooltip="Load Hive Table From Tree" ng-if="userService.hasRole('ROLE_ADMIN')|| hasPermission('project',projectModel, permissions.ADMINISTRATION.mask)" ng-click="openTreeModal()"><i class="fa fa-download"></i></a> + <a class="btn btn-xs btn-primary" tooltip="Add Streaming Table" ng-if="userService.hasRole('ROLE_ADMIN')|| hasPermission('project',projectModel, permissions.ADMINISTRATION.mask)" ng-click="openStreamingSourceModal()"><i class="fa fa-area-chart"></i></a> </div> </div> http://git-wip-us.apache.org/repos/asf/kylin/blob/76040d5a/webapp/app/partials/tables/table_detail.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/tables/table_detail.html b/webapp/app/partials/tables/table_detail.html index 7f299b4..4b3f328 100644 --- a/webapp/app/partials/tables/table_detail.html +++ b/webapp/app/partials/tables/table_detail.html @@ -19,8 +19,8 @@ <div ng-controller="SourceMetaCtrl" class="nav-tabs-custom"> <div class="col-xs-12" ng-show="tableModel.selectedSrcDb&&tableModel.selectedSrcTable.name"> <h3 class="text-info">Table Schema:{{ tableModel.selectedSrcTable.name}}</h3> - <a class="btn btn-primary pull-right" ng-if="userService.hasRole('ROLE_ADMIN')" ng-click="unloadTable(tableModel.selectedSrcTable.database+'.'+tableModel.selectedSrcTable.name)" style="margin-left:10px;" ><span class="fa fa-remove"></span> Unload Table</a> - <a class="btn btn-success pull-right" ng-if="tableModel.selectedSrcTable.source_type==0&&userService.hasRole('ROLE_ADMIN')" ng-click="reloadTable(tableModel.selectedSrcTable.database+'.'+tableModel.selectedSrcTable.name)" style="margin-left:10px;" ><span class="fa fa-download"></span> Reload Table</a> + <a class="btn btn-primary pull-right" ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission('project',projectModel, permissions.ADMINISTRATION.mask)" ng-click="unloadTable(tableModel.selectedSrcTable.database+'.'+tableModel.selectedSrcTable.name)" style="margin-left:10px;" ><span class="fa fa-remove"></span> Unload Table</a> + <a class="btn btn-success pull-right" ng-if="tableModel.selectedSrcTable.source_type==0&&(userService.hasRole('ROLE_ADMIN') || hasPermission('project',projectModel, permissions.ADMINISTRATION.mask))" ng-click="reloadTable(tableModel.selectedSrcTable.database+'.'+tableModel.selectedSrcTable.name)" style="margin-left:10px;" ><span class="fa fa-download"></span> Reload Table</a> <div class="tabbable nav-tabs-custom"> <ul class="nav nav-tabs"> <li class="active"> @@ -185,7 +185,7 @@ </div> <div class="box-body"> <div> - <a tooltip="Load Hive Table" href="javascript:void(0);" ng-if="userService.hasRole('ROLE_MODELER')" + <a tooltip="Load Hive Table" href="javascript:void(0);" ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission('project',projectModel, permissions.ADMINISTRATION.mask)" ng-click="openModal()">Click here to load your hive table</a> </div> </div>
