Repository: kylin Updated Branches: refs/heads/1.5.x-HBase1.1.3 [created] dffbbf3bb
KYLIN-1383 remove deploy.env from front end, for permission control only depend on acl.defaultRole and acl.adminRole in kylin.properties Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/2d4922dc Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/2d4922dc Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/2d4922dc Branch: refs/heads/1.5.x-HBase1.1.3 Commit: 2d4922dc6a55aa9376d424f1fce5454f7151e3de Parents: c4d94f7 Author: Jason <[email protected]> Authored: Thu Mar 3 14:24:38 2016 +0800 Committer: Jason <[email protected]> Committed: Thu Mar 3 14:25:32 2016 +0800 ---------------------------------------------------------------------- webapp/app/js/services/kylinProperties.js | 1 + webapp/app/partials/jobs/jobs.html | 2 +- webapp/app/partials/models/models.html | 2 +- webapp/app/partials/projects/projects.html | 2 +- webapp/app/partials/query/query.html | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/2d4922dc/webapp/app/js/services/kylinProperties.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/services/kylinProperties.js b/webapp/app/js/services/kylinProperties.js index 546db2b..68e8766 100644 --- a/webapp/app/js/services/kylinProperties.js +++ b/webapp/app/js/services/kylinProperties.js @@ -55,6 +55,7 @@ KylinApp.service('kylinConfig', function (AdminService, $log) { return false; } + //deprecated this.getDeployEnv = function () { this.deployEnv = this.getProperty("deploy.env"); if (!this.deployEnv) { http://git-wip-us.apache.org/repos/asf/kylin/blob/2d4922dc/webapp/app/partials/jobs/jobs.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/jobs/jobs.html b/webapp/app/partials/jobs/jobs.html index daf4578..cc5840b 100644 --- a/webapp/app/partials/jobs/jobs.html +++ b/webapp/app/partials/jobs/jobs.html @@ -22,7 +22,7 @@ <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_ADMIN')||kylinConfig.getDeployEnv()!=='PROD'" style="width: 29px" tooltip="Add Project" ng-click="toCreateProj()"> + <a class="btn btn-xs btn-primary" ng-if="userService.hasRole('ROLE_MODELER')" 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/2d4922dc/webapp/app/partials/models/models.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/models/models.html b/webapp/app/partials/models/models.html index 88cc6f3..c8e6ed1 100644 --- a/webapp/app/partials/models/models.html +++ b/webapp/app/partials/models/models.html @@ -21,7 +21,7 @@ <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')" > <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')||kylinConfig.getDeployEnv()!=='PROD'" style="width: 29px" tooltip="Add Project" ng-click="toCreateProj()"> + <a class="btn btn-xs btn-primary" ng-if="userService.hasRole('ROLE_MODELER')" 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/2d4922dc/webapp/app/partials/projects/projects.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/projects/projects.html b/webapp/app/partials/projects/projects.html index 26a2037..96e4a91 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_ADMIN')||userService.hasRole('ROLE_MODELER')&&kylinConfig.getDeployEnv()!=='PROD'" ng-click="toCreateProj()"><i class="fa fa-plus"></i> Project</button> + <button class="btn btn-primary btn-sm" ng-if="userService.hasRole('ROLE_MODELER')" ng-click="toCreateProj()"><i class="fa fa-plus"></i> Project</button> </div> <div ng-if="!loading && projects.length == 0"> http://git-wip-us.apache.org/repos/asf/kylin/blob/2d4922dc/webapp/app/partials/query/query.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/query/query.html b/webapp/app/partials/query/query.html index 0af08d6..69fe649 100644 --- a/webapp/app/partials/query/query.html +++ b/webapp/app/partials/query/query.html @@ -21,7 +21,7 @@ <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')"> <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')||kylinConfig.getDeployEnv()!=='PROD'" style="width: 29px" tooltip="Add Project" ng-click="toCreateProj()"> + <a class="btn btn-xs btn-primary" ng-if="userService.hasRole('ROLE_MODELER')" style="width: 29px" tooltip="Add Project" ng-click="toCreateProj()"> <i class="fa fa-plus"></i> </a> </div>
