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 2015/11/25 11:37:36 UTC
incubator-kylin git commit: KYLIN-1041 resort 'New Model' and 'New
Cube'
Repository: incubator-kylin
Updated Branches:
refs/heads/2.x-staging 91c96b4c9 -> f03a256cf
KYLIN-1041 resort 'New Model' and 'New Cube'
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/f03a256c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/f03a256c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/f03a256c
Branch: refs/heads/2.x-staging
Commit: f03a256cfc8fa0c7175d6585cbeb8e4d9ced9eb1
Parents: 91c96b4
Author: Zhong <ji...@lm-shc-16501192.corp.ebay.com>
Authored: Wed Nov 25 18:36:59 2015 +0800
Committer: Zhong <ji...@lm-shc-16501192.corp.ebay.com>
Committed: Wed Nov 25 18:37:19 2015 +0800
----------------------------------------------------------------------
webapp/app/partials/models/models_tree.html | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/f03a256c/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 9d86c50..30706cf 100644
--- a/webapp/app/partials/models/models_tree.html
+++ b/webapp/app/partials/models/models_tree.html
@@ -18,18 +18,6 @@
<div class="tree-border">
<div class="row">
- <!--<div class="col-xs-7">-->
- <!--<h3 class="text-info">Models</h3>-->
- <!--</div>-->
- <!--<div class="col-xs-5" style="padding-left: 0px;margin-top: 20px;">-->
- <!--<div class="pull-right">-->
- <!--<a href="models/add" class="btn btn-primary btn-xs" tooltip="Create Model" ng-if="userService.hasRole('ROLE_MODELER')"><i class="fa fa-plus"></i> Model</a>-->
- <!--</div>-->
- <!--<div class="pull-right" style="margin-right: 3px;">-->
- <!--<!–<a class="btn btn-xs btn-primary" href='models/add' tooltip="Create Model" ng-if="userService.hasRole('ROLE_MODELER')"><i class="fa fa-plus"></i></a>–>-->
- <!--<a href="cubes/add" ng-if="userService.hasRole('ROLE_ADMIN')" class="btn btn-primary btn-xs"><i class="fa fa-plus"></i> Cube</a>-->
- <!--</div>-->
- <!--</div>-->
<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">
@@ -37,12 +25,12 @@
<!--<i> New </i> <span class="caret"></span>-->
</a>
<ul class="dropdown-menu">
- <li ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission(modelsManager.selectedModel, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask, permissions.OPERATION.mask)">
- <a href="cubes/add" ng-if="userService.hasRole('ROLE_ADMIN')"><i class="fa fa-cube"></i>New Cube</a>
- </li>
<li ng-if="userService.hasRole('ROLE_ADMIN')">
<a href="models/add" ng-if="userService.hasRole('ROLE_MODELER')"><i class="fa fa-star"></i> New Model</a>
</li>
+ <li ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission(modelsManager.selectedModel, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask, permissions.OPERATION.mask)">
+ <a href="cubes/add" ng-if="userService.hasRole('ROLE_ADMIN')"><i class="fa fa-cube"></i>New Cube</a>
+ </li>
</ul>
</div>