From abb37299cb17bb4ca4221f89fbe47cc09ab9f32f Mon Sep 17 00:00:00 2001 From: Marliana Lara Date: Mon, 3 Jun 2019 13:20:23 -0400 Subject: [PATCH] Add isolated badge to instance groups list --- awx/ui/client/features/output/details.component.js | 2 +- awx/ui/client/src/instance-groups/instance-groups.strings.js | 3 ++- .../instance-groups/list/instance-groups-list.partial.html | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/awx/ui/client/features/output/details.component.js b/awx/ui/client/features/output/details.component.js index 275370d67f..9bddc202f7 100644 --- a/awx/ui/client/features/output/details.component.js +++ b/awx/ui/client/features/output/details.component.js @@ -527,7 +527,7 @@ function getInstanceGroupDetails () { let isolated = null; - if (instanceGroup.controller_id) { + if (instanceGroup.is_isolated) { isolated = strings.get('details.ISOLATED'); } diff --git a/awx/ui/client/src/instance-groups/instance-groups.strings.js b/awx/ui/client/src/instance-groups/instance-groups.strings.js index 0850734bf8..ad4fff924b 100644 --- a/awx/ui/client/src/instance-groups/instance-groups.strings.js +++ b/awx/ui/client/src/instance-groups/instance-groups.strings.js @@ -14,6 +14,7 @@ function InstanceGroupsStrings (BaseString) { MANUAL: t.s('MANUAL'), PANEL_TITLE: t.s('INSTANCE GROUPS'), ROW_ITEM_LABEL_INSTANCES: t.s('Instances'), + ROW_ITEM_LABEL_ISOLATED: t.s('ISOLATED'), ROW_ITEM_LABEL_RUNNING_JOBS: t.s('Running Jobs'), ROW_ITEM_LABEL_TOTAL_JOBS: t.s('Total Jobs'), ROW_ITEM_LABEL_USED_CAPACITY: t.s('Used Capacity') @@ -58,7 +59,7 @@ function InstanceGroupsStrings (BaseString) { DELETE: t.s('Unable to delete instance group.'), }; - ns.alert = { + ns.alert = { MISSING_PARAMETER: t.s('Instance Group parameter is missing.'), }; } diff --git a/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html b/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html index 962d406a7b..864d5f1201 100644 --- a/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html +++ b/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html @@ -45,7 +45,9 @@
+ header-link="/#/instance_groups/{{ instance_group.id }}" + header-tag="{{ instance_group.is_isolated ? vm.strings.get('list.ROW_ITEM_LABEL_ISOLATED') : '' }}" + >