Repository: ambari Updated Branches: refs/heads/trunk 7301a8031 -> 54db4072e
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/54db4072 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/54db4072 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/54db4072 Branch: refs/heads/trunk Commit: 54db4072e87e4efc09d68d9b4c53b6f562983d9f Parents: 7301a80 Author: Sangeeta Ravindran <[email protected]> Authored: Mon Jan 16 12:58:14 2017 -0800 Committer: Sangeeta Ravindran <[email protected]> Committed: Mon Jan 16 12:58:26 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/54db4072/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', {
