kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nju_y...@apache.org
Subject [39/50] kylin git commit: KYLIN-1383 remove deploy.env from front end, for permission control only depend on acl.defaultRole and acl.adminRole in kylin.properties
Date Mon, 18 Apr 2016 06:35:21 GMT
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/a19fce65
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/a19fce65
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/a19fce65

Branch: refs/heads/1.4-rc
Commit: a19fce65691c30d96cda881520384842852ce968
Parents: 2cefa34
Author: Jason <jiatuer@163.com>
Authored: Thu Mar 3 14:29:51 2016 +0800
Committer: Jason <jiatuer@163.com>
Committed: Thu Mar 3 14:29:51 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/a19fce65/webapp/app/js/services/kylinProperties.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/services/kylinProperties.js b/webapp/app/js/services/kylinProperties.js
index b1f04c0..9f62657 100644
--- a/webapp/app/js/services/kylinProperties.js
+++ b/webapp/app/js/services/kylinProperties.js
@@ -56,6 +56,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/a19fce65/webapp/app/partials/jobs/jobs.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/jobs/jobs.html b/webapp/app/partials/jobs/jobs.html
index a3b8324..5f79f56 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/a19fce65/webapp/app/partials/models/models.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/models/models.html b/webapp/app/partials/models/models.html
index 1280214..8594b50 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/a19fce65/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/a19fce65/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>


Mime
View raw message