Repository: ambari Updated Branches: refs/heads/trunk 63ede8195 -> 80040e0f2
AMBARI-16441: RBAC UI Edits #6 (rzang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/80040e0f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/80040e0f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/80040e0f Branch: refs/heads/trunk Commit: 80040e0f2cb53fe8296a7cf5d4898d7a2eab7003 Parents: 63ede81 Author: Richard Zang <rz...@apache.org> Authored: Wed May 11 13:19:01 2016 -0700 Committer: Richard Zang <rz...@apache.org> Committed: Wed May 11 13:19:40 2016 -0700 ---------------------------------------------------------------------- .../controllers/clusters/ClustersManageAccessCtrl.js | 11 ++--------- .../scripts/controllers/clusters/UserAccessListCtrl.js | 12 +++++++++--- .../admin-web/app/scripts/services/RoleDetailsModal.js | 8 ++++++++ .../ui/admin-web/app/views/clusters/userAccessList.html | 3 ++- .../ui/admin-web/app/views/modals/RoleDetailsModal.html | 3 ++- 5 files changed, 23 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/80040e0f/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/ClustersManageAccessCtrl.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/ClustersManageAccessCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/ClustersManageAccessCtrl.js index c92374b..ff255ef 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/ClustersManageAccessCtrl.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/ClustersManageAccessCtrl.js @@ -91,14 +91,7 @@ angular.module('ambariAdminConsole') $scope.showHelpPage = function() { Cluster.getRolesWithAuthorizations().then(function(roles) { - RoleDetailsModal.show(roles.map(function(role) { - role.authorizations = role.authorizations.map(function(authorization) { - return authorization.AuthorizationInfo; - }); - var r = role.PermissionInfo; - r.authorizations = role.authorizations; - return r; - })); + RoleDetailsModal.show(roles); }); - } + }; }]); http://git-wip-us.apache.org/repos/asf/ambari/blob/80040e0f/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js index 32f46c1..11a73f6 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js @@ -18,8 +18,8 @@ 'use strict'; angular.module('ambariAdminConsole') -.controller('UserAccessListCtrl',['$scope', '$location', 'Cluster', '$modal', '$rootScope', '$routeParams', 'PermissionSaver', 'Alert', '$translate', -function($scope, $location, Cluster, $modal, $rootScope, $routeParams, PermissionSaver, Alert, $translate) { +.controller('UserAccessListCtrl',['$scope', '$location', 'Cluster', '$modal', '$rootScope', '$routeParams', 'PermissionSaver', 'Alert', '$translate', 'RoleDetailsModal', +function($scope, $location, Cluster, $modal, $rootScope, $routeParams, PermissionSaver, Alert, $translate, RoleDetailsModal) { var $t = $translate.instant; $scope.constants = { users: $t('common.users').toLowerCase(), @@ -242,5 +242,11 @@ function($scope, $location, Cluster, $modal, $rootScope, $routeParams, Permissio $scope.switchToBlock = function() { $location.url('/clusters/' + $routeParams.id + '/manageAccess'); - } + }; + + $scope.showHelpPage = function() { + Cluster.getRolesWithAuthorizations().then(function(roles) { + RoleDetailsModal.show(roles); + }); + }; }]); http://git-wip-us.apache.org/repos/asf/ambari/blob/80040e0f/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/RoleDetailsModal.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/RoleDetailsModal.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/RoleDetailsModal.js index eced664..7c03f4d 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/RoleDetailsModal.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/RoleDetailsModal.js @@ -21,6 +21,14 @@ angular.module('ambariAdminConsole') .factory('RoleDetailsModal', ['$modal', 'Cluster', function($modal, Cluster) { return { show: function(roles) { + roles = roles.map(function(role) { + role.authorizations = role.authorizations.map(function(authorization) { + return authorization.AuthorizationInfo; + }); + var r = role.PermissionInfo; + r.authorizations = role.authorizations; + return r; + }); var modalInstance = $modal.open({ templateUrl: 'views/modals/RoleDetailsModal.html', size: 'lg', http://git-wip-us.apache.org/repos/asf/ambari/blob/80040e0f/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 e3bbcdc..708e68a 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 @@ -51,7 +51,8 @@ </div> </th> <th colspan="2"> - <label for="">{{'clusters.role' | translate}}</label> + <label for="">{{'clusters.role' | translate}}</label> + <i class="glyphicon glyphicon-question-sign green-icon cursor-pointer" ng-click="showHelpPage()"></i> <select class="form-control statusfilter" ng-model="currentRoleFilter" ng-options="item.label for item in roleFilterOptions" http://git-wip-us.apache.org/repos/asf/ambari/blob/80040e0f/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/RoleDetailsModal.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/RoleDetailsModal.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/RoleDetailsModal.html index 74a1807..46c65b1 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/RoleDetailsModal.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/RoleDetailsModal.html @@ -17,7 +17,8 @@ --> <div class="modal-header text-center"> - <h4 class="modal-title">{{'common.rbac' | translate}}</h4> + <button type="button" class="close" data-dismiss="modal" ng-click="ok()"><span aria-hidden="true">×</span><span class="sr-only">{{'common.controls.close' | translate}}</span></button> + <h4 class="modal-title">{{'common.rbac' | translate}}</h4> </div> <div class="modal-body role-details-modal"> <table class="table table-hover table-bordered fixed-header">
