You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rz...@apache.org on 2016/06/14 22:54:50 UTC
ambari git commit: AMBARI-17239 - Nothing shows on the role section
when user has the same role as its group (rzang)
Repository: ambari
Updated Branches:
refs/heads/trunk 2555de727 -> dbf3c65c6
AMBARI-17239 - Nothing shows on the role section when user has the same role as its group (rzang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dbf3c65c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dbf3c65c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dbf3c65c
Branch: refs/heads/trunk
Commit: dbf3c65c6a53fb7ad27b17de4ef94994e16f897b
Parents: 2555de7
Author: Richard Zang <rz...@apache.org>
Authored: Tue Jun 14 15:54:02 2016 -0700
Committer: Richard Zang <rz...@apache.org>
Committed: Tue Jun 14 15:54:02 2016 -0700
----------------------------------------------------------------------
.../app/scripts/controllers/users/UsersShowCtrl.js | 17 +++++++++++++----
.../ui/admin-web/app/views/users/show.html | 4 ++--
2 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/dbf3c65c/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js
index 69a15bd..f2c2467 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js
@@ -218,14 +218,23 @@ angular.module('ambariAdminConsole')
privilege = privilege.PrivilegeInfo;
if(privilege.type === 'CLUSTER'){
// This is cluster
- privileges.clusters[privilege.cluster_name] = privileges.clusters[privilege.cluster_name] || [];
- privileges.clusters[privilege.cluster_name].push(privilege.permission_label);
+ if (privileges.clusters[privilege.cluster_name]) {
+ var preIndex = Cluster.orderedRoles.indexOf(privileges.clusters[privilege.cluster_name].permission_name);
+ var curIndex = Cluster.orderedRoles.indexOf(privilege.permission_name);
+ // replace when cur is a more powerful role
+ if (curIndex < preIndex) {
+ privileges.clusters[privilege.cluster_name] = privilege;
+ }
+ } else {
+ privileges.clusters[privilege.cluster_name] = privilege;
+ }
} else if ( privilege.type === 'VIEW'){
privileges.views[privilege.instance_name] = privileges.views[privilege.instance_name] || { privileges:[]};
privileges.views[privilege.instance_name].version = privilege.version;
privileges.views[privilege.instance_name].view_name = privilege.view_name;
- privileges.views[privilege.instance_name].privileges.push(privilege.permission_label);
-
+ if (privileges.views[privilege.instance_name].privileges.indexOf(privilege.permission_label) == -1) {
+ privileges.views[privilege.instance_name].privileges.push(privilege.permission_label);
+ }
}
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/dbf3c65c/ambari-admin/src/main/resources/ui/admin-web/app/views/users/show.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/users/show.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/users/show.html
index 18df5fa..a1b4c95 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/users/show.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/users/show.html
@@ -83,7 +83,7 @@
<a href="#/clusters/{{name}}/manageAccess">{{name}}</a>
</td>
<td>
- <span tooltip="{{item}}" ng-repeat="item in privilege">{{item | translate}}{{$last ? '' : ', '}}</span>
+ <span tooltip="{{privilege.permission_label}}">{{privilege.permission_label}}</span>
</td>
</tr>
<tr>
@@ -103,7 +103,7 @@
<a href="#/views/{{privilege.view_name}}/versions/{{privilege.version}}/instances/{{name}}/edit">{{name}}</a>
</td>
<td>
- <span tooltip="{{item}}" ng-repeat="item in privilege.privileges">{{item | translate}}{{$last ? '' : ', '}}</span>
+ <span tooltip="{{item}}" ng-repeat="item in privilege.privileges track by $index">{{item | translate}}{{$last ? '' : ', '}}</span>
</td>
</tr>
<tr>