ambari git commit: AMBARI-15802 PUT request is sent when clicking on Admin/Manage Ambari/Roles. (atkach)

[atkach]

Repository: ambari
Updated Branches:
  refs/heads/trunk 39c85bb82 -> 9954f5049


AMBARI-15802 PUT request is sent when clicking on Admin/Manage Ambari/Roles. 
(atkach)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9954f504
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9954f504
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9954f504

Branch: refs/heads/trunk
Commit: 9954f5049ca494038cde027a2c5e8707f1acbae1
Parents: 39c85bb
Author: Andrii Tkach <atk...@apache.org>
Authored: Mon Apr 11 15:32:31 2016 +0300
Committer: Andrii Tkach <atk...@apache.org>
Committed: Mon Apr 11 20:03:31 2016 +0300

----------------------------------------------------------------------
 .../controllers/clusters/ClustersManageAccessCtrl.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/9954f504/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 26147c7..4cb3328 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
@@ -18,7 +18,7 @@
 'use strict';
 
 angular.module('ambariAdminConsole')
-.controller('ClustersManageAccessCtrl', ['$scope', '$location', 'Cluster', 
'$routeParams', 'Alert', 'PermissionLoader', 'PermissionSaver', '$translate', 
'RoleDetailsModal', function($scope, $location, Cluster, $routeParams, Alert, 
PermissionLoader, PermissionSaver, $translate, RoleDetailsModal) {
+.controller('ClustersManageAccessCtrl', ['$scope', '$location', 'Cluster', 
'$routeParams', 'Alert', 'PermissionLoader', 'PermissionSaver', '$translate', 
'RoleDetailsModal', '$timeout', function($scope, $location, Cluster, 
$routeParams, Alert, PermissionLoader, PermissionSaver, $translate, 
RoleDetailsModal, $timeout) {
   var $t = $translate.instant;
   $scope.getConstant = function (key) {
     return $t('common.' + key).toLowerCase();
@@ -31,6 +31,10 @@ angular.module('ambariAdminConsole')
       // Refresh data for rendering
       $scope.permissionsEdit = permissions;
       $scope.permissions = angular.copy(permissions);
+      //"$scope.isDataLoaded" should be set to true on initial load after 
"$scope.permissionsEdit" watcher
+      $timeout(function() {
+        $scope.isDataLoaded = true;
+      });
       var orderedRoles = Cluster.orderedRoles;
       var pms = [];
       for (var key in orderedRoles) {
@@ -42,12 +46,13 @@ angular.module('ambariAdminConsole')
       Alert.error($t('clusters.alerts.cannotLoadClusterData'), 
data.data.message);
     });
   }
- 
+
+  $scope.isDataLoaded = false;
   reloadClusterData();
   $scope.isEditMode = false;
   $scope.permissions = {};
   $scope.clusterName = $routeParams.id;
-  
+
 
   $scope.toggleEditMode = function() {
     $scope.isEditMode = !$scope.isEditMode;
@@ -75,14 +80,14 @@ angular.module('ambariAdminConsole')
   $scope.$watch(function() {
     return $scope.permissionsEdit;
   }, function(newValue) {
-    if(newValue){
+    if (newValue && $scope.isDataloaded) {
       $scope.save();
     }
   }, true);
 
   $scope.switchToList = function() {
     $location.url('/clusters/' + $routeParams.id + '/userAccessList');
-  },
+  };
 
   $scope.showHelpPage = function() {
     Cluster.getRolesWithAuthorizations().then(function(roles) {