AMBARI-16441: RBAC UI Edits #6 (rzang)

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);
     });
-  }
+  };
 }]);

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);
+    });
+  };
 }]);

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',

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>&nbsp;
+        <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"

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">&times;</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">