Repository: ambari Updated Branches: refs/heads/branch-2.4 dad2cf34b -> f0d062c80
AMBARI-17326 - Mark the role "(from group)" if there is no specific user level role set. (rzang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f0d062c8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f0d062c8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f0d062c8 Branch: refs/heads/branch-2.4 Commit: f0d062c80c9e675b7ecd30168af892b6ada36c19 Parents: dad2cf3 Author: Richard Zang <[email protected]> Authored: Tue Jun 21 12:45:31 2016 -0700 Committer: Richard Zang <[email protected]> Committed: Tue Jun 21 13:08:28 2016 -0700 ---------------------------------------------------------------------- .../src/main/resources/ui/admin-web/app/scripts/i18n.config.js | 1 + .../resources/ui/admin-web/app/views/clusters/userAccessList.html | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f0d062c8/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js index b4138b3..f896c02 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js @@ -91,6 +91,7 @@ angular.module('ambariAdminConsole') 'rbac': 'Role Based Access Control', 'important': 'Important', 'undo': 'Undo', + 'fromGroupMark': '(from group)', 'clusterNameChangeConfirmation': { 'title': 'Confirm Cluster Name Change', http://git-wip-us.apache.org/repos/asf/ambari/blob/f0d062c8/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/userAccessList.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/userAccessList.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/userAccessList.html index c0f6144..7b54f9f 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/userAccessList.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/userAccessList.html @@ -71,6 +71,7 @@ <select class="role-select" ng-show="user.editable" ng-model="user.permission_name" ng-options="role.permission_name as role.permission_label for role in roleValueOptions"> </select> + <span ng-show="user.principal_type != $parent.currentTypeFilter.value"> {{'common.fromGroupMark' | translate}}</span> <span ng-show="user.permission_name != user.original_perm"> <button class="btn btn-default btn-xs cancel" ng-click="cancel(user)"> <span class="glyphicon glyphicon-remove cancel"></span>
