Repository: kylin Updated Branches: refs/heads/2.0-rc ec208d1ff -> 8ea8e471a
minor, UI permission for analyst update Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/8ea8e471 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/8ea8e471 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/8ea8e471 Branch: refs/heads/2.0-rc Commit: 8ea8e471a24c30ab6acc991d417a940ce12cbb29 Parents: ec208d1 Author: janzhongi <jiazh...@ebay.com> Authored: Wed Jan 27 19:55:26 2016 +0800 Committer: janzhongi <jiazh...@ebay.com> Committed: Wed Jan 27 19:55:26 2016 +0800 ---------------------------------------------------------------------- webapp/app/partials/jobs/jobs.html | 4 ++-- webapp/app/partials/models/models.html | 4 ++-- webapp/app/partials/models/models_tree.html | 2 +- webapp/app/partials/query/query.html | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/8ea8e471/webapp/app/partials/jobs/jobs.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/jobs/jobs.html b/webapp/app/partials/jobs/jobs.html index fca5f88..a3b8324 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"> + <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" style="width: 29px" ng-if="userService.hasRole('ROLE_ADMIN')||userService.hasRole('ROLE_MODELER')&&kylinConfig.getDeployEnv()!=='PROD'" tooltip="Add Project" ng-click="toCreateProj()"> + <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()"> <i class="fa fa-plus"></i> </a> </div> http://git-wip-us.apache.org/repos/asf/kylin/blob/8ea8e471/webapp/app/partials/models/models.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/models/models.html b/webapp/app/partials/models/models.html index 4d8c7ac..1280214 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"> + <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')||userService.hasRole('ROLE_MODELER')&&kylinConfig.getDeployEnv()!=='PROD'" style="width: 29px" tooltip="Add Project" ng-click="toCreateProj()"> + <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()"> <i class="fa fa-plus"></i> </a> </div> http://git-wip-us.apache.org/repos/asf/kylin/blob/8ea8e471/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 8f76113..8201727 100644 --- a/webapp/app/partials/models/models_tree.html +++ b/webapp/app/partials/models/models_tree.html @@ -20,7 +20,7 @@ <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 class="dropdown-toggle" data-toggle="dropdown" href="#" aria-expanded="true"> + <a class="dropdown-toggle" ng-if="userService.hasRole('ROLE_MODELER')" 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> http://git-wip-us.apache.org/repos/asf/kylin/blob/8ea8e471/webapp/app/partials/query/query.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/query/query.html b/webapp/app/partials/query/query.html index d34dbc7..0af08d6 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"> + <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')||userService.hasRole('ROLE_MODELER')&&kylinConfig.getDeployEnv()!=='PROD'" style="width: 29px" tooltip="Add Project" ng-click="toCreateProj()"> + <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()"> <i class="fa fa-plus"></i> </a> </div>
