AMBARI-7127. Admin View: misc improvements. (yusaku)

ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js

@@ -19,6 +19,7 @@
 
 angular.module('ambariAdminConsole')
 .controller('ViewsEditCtrl', ['$scope', '$routeParams' , 'View', 'uiAlert', 'PermissionLoader', 'PermissionSaver', 'ConfirmationModal', '$location', function($scope, $routeParams, View, uiAlert, PermissionLoader, PermissionSaver, ConfirmationModal, $location) {
+  $scope.identity = angular.identity;
   $scope.isConfigurationEmpty = true;
   function reloadViewInfo(){
     // Load instance data, after View permissions meta loaded

ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/ClustersManageAccessCtrl.js

@@ -19,6 +19,7 @@
 
 angular.module('ambariAdminConsole')
 .controller('ClustersManageAccessCtrl', ['$scope', 'Cluster', '$routeParams', 'uiAlert', 'PermissionLoader', 'PermissionSaver', function($scope, Cluster, $routeParams, uiAlert, PermissionLoader, PermissionSaver) {
+  $scope.identity = angular.identity;
   function reloadClusterData(){
     PermissionLoader.getClusterPermissions({
       clusterId: $routeParams.id

ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsListCtrl.js

@@ -30,7 +30,7 @@ angular.module('ambariAdminConsole')
   $scope.pageChanged = function() {
     loadGroups();
   };
-  $scope.usersPerPageChanges = function() {
+  $scope.groupsPerPageChanges = function() {
     loadGroups();
   };
 

ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersListCtrl.js

@@ -30,7 +30,7 @@ angular.module('ambariAdminConsole')
     $scope.loadUsers();
   };
   $scope.usersPerPageChanges = function() {
-    $scope.loadUsers();
+    $scope.resetPagination();
   };
 
   $scope.loadUsers = function(){

ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js

@@ -28,7 +28,7 @@ angular.module('ambariAdminConsole')
   }
 
   loadUserInfo();  
-  $scope.user = {};
+  $scope.user;
   $scope.isCurrentUser = true;
   $scope.dataLoaded = false;
 

ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html

@@ -61,7 +61,7 @@
       </div>
       <div class="form-group"
       ng-class="{'has-error' : ( (form.isntanceCreateForm.displayLabel.$error.required || form.isntanceCreateForm.displayLabel.$error.pattern) && form.isntanceCreateForm.submitted)}">
-        <label for="" class="control-label col-sm-2">Display Label</label>
+        <label for="" class="control-label col-sm-2">Display Name</label>
         <div class="col-sm-10">
           <input type="text" class="form-control instancelabel-input" name="displayLabel" ng-model="instance.label" required ng-pattern="/^([a-zA-Z0-9._\s]+)$/" autocomplete="off">
 

ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html

@@ -117,7 +117,7 @@
             <div class="" ng-switch="editPermissionDisabled">
               <textarea name="" id="" cols="30" rows="4" class="form-control permission-textarea-user" ng-model="permissionsEdit[permission.PermissionInfo.permission_name].USER" ng-switch-when="false"></textarea>
               <div class="well" ng-switch-when="true">
-                <span ng-repeat="user in permission.USER">
+                <span ng-repeat="user in permission.USER | orderBy:identity">
                   <link-to route="users.show" id="{{user}}">{{user}}</link-to>
                   {{$last ? '' :', '}}
                 </span>
@@ -128,7 +128,7 @@
             <div class="" ng-switch="editPermissionDisabled">
               <textarea name="" id="" cols="30" rows="4" class="form-control permission-textarea-group" ng-model="permissionsEdit[permission.PermissionInfo.permission_name].GROUP" ng-switch-when="false"></textarea>
               <div class="well" ng-switch-when="true">
-                <span ng-repeat="group in permission.GROUP">
+                <span ng-repeat="group in permission.GROUP | orderBy:identity">
                   <link-to route="groups.edit" id="{{group}}" >{{group}}</link-to>
                   {{$last ? '' :', '}}
                 </span>

ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/manageAccess.html

@@ -41,7 +41,7 @@
           <div class="" ng-switch="isEditMode">
             <textarea ng-switch-when="true" name="" id="" cols="30" rows="4" class="form-control permission-user-input" ng-model="permissionsEdit[permission.PermissionInfo.permission_name].USER"></textarea>
             <div class="well" ng-switch-default>
-              <span ng-repeat="user in permission.USER">
+              <span ng-repeat="user in permission.USER | orderBy:identity">
                 <link-to route="users.show" id="{{user}}" >{{user}}</link-to>
                 {{$last ? '' :', '}}
               </span>
@@ -50,7 +50,7 @@
         </td>
         <td>
           <div class="" ng-switch="isEditMode">
-            <textarea ng-switch-when="true" name="" id="" cols="30" rows="4" class="form-control permission-group-input" ng-model="permissionsEdit[permission.PermissionInfo.permission_name].GROUP"></textarea>
+            <textarea ng-switch-when="true" name="" id="" cols="30" rows="4" class="form-control permission-group-input" ng-model="permissionsEdit[permission.PermissionInfo.permission_name].GROUP | orderBy:identity"></textarea>
             <div class="well" ng-switch-default>
               <span ng-repeat="group in permission.GROUP">
                 <link-to route="groups.edit" id="{{group}}">{{group}}</link-to>

ambari-admin/src/main/resources/ui/admin-web/app/views/groups/list.html

@@ -27,15 +27,6 @@
   <hr>
   <table class="table table-striped table-hover col-sm-12">
     <thead>
-      <!-- <tr>
-        <th>
-          <label for="">Group Name</label>
-        </th>
-        <th>
-          <label for="">Type</label>
-        </th>
-        <th><label for="">Members</label></th>
-      </tr> -->
       <tr>
         <th class="col-sm-8">
           <div class="search-container">

ambari-admin/src/main/resources/ui/admin-web/app/views/users/show.html

@@ -16,7 +16,7 @@
 * limitations under the License.
 -->
     
-<div ng-show="user.user_name" class="user-edit-panel">
+<div ng-show="user" class="user-edit-panel">
   <div class="clearfix">
     <ol class="breadcrumb pull-left">
       <li><a href="#/users">Users</a></li>