ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sangee...@apache.org
Subject ambari git commit: AMBARI-19535: When viewing details of a group, the group type is sometimes empty (sangeetar)
Date Mon, 16 Jan 2017 18:20:30 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 fa6a4aa81 -> 38e0b578b


AMBARI-19535: When viewing details of a group, the group type is sometimes empty (sangeetar)


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

Branch: refs/heads/branch-2.5
Commit: 38e0b578b59aa662c6a41f67948aa25bc9679934
Parents: fa6a4aa
Author: Sangeeta Ravindran <sangeetar@apache.org>
Authored: Mon Jan 16 10:20:10 2017 -0800
Committer: Sangeeta Ravindran <sangeetar@apache.org>
Committed: Mon Jan 16 10:20:10 2017 -0800

----------------------------------------------------------------------
 .../admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/38e0b578/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js
index aa6af2a..c61e71c 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js
@@ -68,7 +68,6 @@ angular.module('ambariAdminConsole')
 
   function loadMembers(){
     $scope.group.getMembers().then(function(members) {
-      $scope.group.groupTypeName = $t(GroupConstants.TYPES[$scope.group.group_type].LABEL_KEY);
       $scope.groupMembers = members;
       $scope.group.editingUsers = angular.copy($scope.groupMembers);
     });
@@ -76,11 +75,12 @@ angular.module('ambariAdminConsole')
   
   $scope.group.isLDAP().then(function(isLDAP) {
     $scope.group.ldap_group = isLDAP;
+    $scope.group.getGroupType().then(function() {
+      $scope.group.groupTypeName = $t(GroupConstants.TYPES[$scope.group.group_type].LABEL_KEY);
+    });
     loadMembers();
   });
 
-  $scope.group.getGroupType();
-
   $scope.deleteGroup = function(group) {
     ConfirmationModal.show(
       $t('common.delete', {


Mime
View raw message