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/21 19:46:14 UTC
ambari git commit: AMBARI-17326 - Mark the role "(from group)" if
there is no specific user level role set. (rzang)
Repository: ambari
Updated Branches:
refs/heads/trunk 9b034b234 -> 50d794c7d
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/50d794c7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/50d794c7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/50d794c7
Branch: refs/heads/trunk
Commit: 50d794c7dff38a3613ca61bd8f112e6cef50ef1b
Parents: 9b034b2
Author: Richard Zang <rz...@apache.org>
Authored: Tue Jun 21 12:45:31 2016 -0700
Committer: Richard Zang <rz...@apache.org>
Committed: Tue Jun 21 12:45:31 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/50d794c7/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/50d794c7/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>