From ec1c2a8391447bd0e9b7db476f166905d461b130 Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Tue, 7 Jan 2020 11:50:04 -0500 Subject: [PATCH] Remove status icons from group nested groups --- .../group-nested-groups-list.controller.js | 28 ------------------- .../nested-groups/group-nested-groups.list.js | 4 --- 2 files changed, 32 deletions(-) diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-list.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-list.controller.js index 65961998d6..c97fe843da 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-list.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-list.controller.js @@ -35,10 +35,6 @@ $scope.inventory_id = $stateParams.inventory_id; - $scope.$watchCollection(list.name, function(){ - _.forEach($scope[list.name], processRow); - }); - $scope.$on('selectedOrDeselected', function(e, value) { let item = value.value; @@ -57,30 +53,6 @@ } - function processRow(group){ - if (group === undefined || group === null) { - group = {}; - } - - angular.forEach($scope.groupsSelected, function(selectedGroup){ - if(selectedGroup.id === group.id) { - group.isSelected = true; - } - }); - - let hosts_status; - - hosts_status = GetHostsStatusMsg({ - active_failures: group.hosts_with_active_failures, - total_hosts: group.total_hosts, - inventory_id: $scope.inventory_id, - group_id: group.id - }); - _.assign(group, - {hosts_status_tip: hosts_status.tooltip}, - {hosts_status_class: hosts_status.class}); - } - $scope.disassociateGroup = function(group){ $scope.toDisassociate = {}; angular.extend($scope.toDisassociate, group); diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js index be7f9b5b08..18385106a3 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js @@ -19,15 +19,11 @@ layoutClass: 'List-staticColumnLayout--groups', staticColumns: [ { - field: 'failed_hosts', content: { label: '', - nosort: true, mode: 'all', iconOnly: true, - awToolTip: "{{ nested_group.hosts_status_tip }}", dataPlacement: "top", - icon: "{{ 'fa icon-job-' + nested_group.hosts_status_class }}", columnClass: 'status-column' } }