[kylin] branch master updated: KYLIN-4377: allow project administrator to operate hybrid model

[ni...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

nic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/master by this push:
     new 908ea30  KYLIN-4377: allow project administrator to operate hybrid model
908ea30 is described below

commit 908ea305334beb631f7b42fcd1e6b8e461d0dfa9
Author: Zhou Kang <zh...@xiaomi.com>
AuthorDate: Wed Feb 12 11:01:01 2020 +0800

    KYLIN-4377: allow project administrator to operate hybrid model
---
 webapp/app/partials/models/models_tree.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/app/partials/models/models_tree.html b/webapp/app/partials/models/models_tree.html
index 1009f86..1ce3222 100644
--- a/webapp/app/partials/models/models_tree.html
+++ b/webapp/app/partials/models/models_tree.html
@@ -85,7 +85,7 @@
               <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
                 Action <span class="ace-icon fa fa-caret-down icon-on-right"></span>
               </button>
-              <ul class="dropdown-menu" role="menu" style="right:0;left:auto;" ng-if="(userService.hasRole('ROLE_ADMIN') || hasPermission('model',model, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask))">
+              <ul class="dropdown-menu" role="menu" style="right:0;left:auto;" ng-if="(userService.hasRole('ROLE_ADMIN') || hasPermission('model', hybridInstance, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask))">
                 <li><a ng-click="editHybridInstance(hybridInstance)" title="Edit Hybrid" style="cursor:pointer;margin-right: 8px;" >Edit</a></li>
                 <li><a ng-click="dropHybridInstance(hybridInstance)" title="Drop Hybrid"  style="cursor:pointer;margin-right: 8px;">Drop</a></li>
               </ul>