You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by zh...@apache.org on 2016/07/29 10:41:07 UTC

kylin git commit: KYLIN-1929 fix error when load monitor page for non-admin

Repository: kylin
Updated Branches:
  refs/heads/master 5e4f17362 -> 4cbb1c616


KYLIN-1929 fix error when load monitor page for non-admin


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/4cbb1c61
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/4cbb1c61
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/4cbb1c61

Branch: refs/heads/master
Commit: 4cbb1c6161b37e7045433ff03bbffa49692fa1c0
Parents: 5e4f173
Author: Jason <ji...@163.com>
Authored: Fri Jul 29 18:40:13 2016 +0800
Committer: Jason <ji...@163.com>
Committed: Fri Jul 29 18:40:35 2016 +0800

----------------------------------------------------------------------
 webapp/app/partials/jobs/jobs.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/4cbb1c61/webapp/app/partials/jobs/jobs.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/jobs/jobs.html b/webapp/app/partials/jobs/jobs.html
index e2aa3f4..78c2220 100644
--- a/webapp/app/partials/jobs/jobs.html
+++ b/webapp/app/partials/jobs/jobs.html
@@ -33,7 +33,7 @@
 
 <div class="row models-main dataTables_wrapper"  style="padding-top:10px;padding-left: 5px;">
   <div ng-class="row">
-    <tabset>
+    <tabset ng-if="userService.hasRole('ROLE_ADMIN')">
       <tab heading="Jobs" select="jobTabSelected('jobs')" active="tabs[2].active">
         <div class="col-xs-12" ng-include src="'partials/jobs/jobList.html'"></div>
       </tab>
@@ -41,9 +41,9 @@
         <div class="col-xs-12" ng-include src="'partials/jobs/badQuery.html'"></div>
       </tab>
     </tabset>
+    <div ng-if="!userService.hasRole('ROLE_ADMIN')" class="col-xs-12" ng-include src="'partials/jobs/jobList.html'"></div>
   </div>
 </div>
 
 
-
 <div ng-include="'partials/projects/project_create.html'"></div>