Repository: ambari Updated Branches: refs/heads/branch-2.4 3bce44b17 -> 54df598f5
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/54df598f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/54df598f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/54df598f Branch: refs/heads/branch-2.4 Commit: 54df598f5a06669aa0a736644d5511cf4bfc82ba Parents: 3bce44b Author: Richard Zang <[email protected]> Authored: Tue Jun 14 15:54:02 2016 -0700 Committer: Richard Zang <[email protected]> Committed: Tue Jun 14 15:58:49 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/54df598f/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/54df598f/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>
