diff --git a/awx/api/serializers.py b/awx/api/serializers.py index da6bc32e97..048bafa149 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -135,7 +135,7 @@ SUMMARIZABLE_FK_FIELDS = { 'source_script': ('name', 'description'), 'role': ('id', 'role_field'), 'notification_template': DEFAULT_SUMMARY_FIELDS, - 'instance_group': ('id', 'name', 'controller_id'), + 'instance_group': ('id', 'name', 'controller_id', 'is_containerized'), 'insights_credential': DEFAULT_SUMMARY_FIELDS, 'source_credential': DEFAULT_SUMMARY_FIELDS + ('kind', 'cloud', 'credential_type_id'), 'target_credential': DEFAULT_SUMMARY_FIELDS + ('kind', 'cloud', 'credential_type_id'), diff --git a/awx/ui/client/features/output/details.component.js b/awx/ui/client/features/output/details.component.js index 71607a5a83..7be064e056 100644 --- a/awx/ui/client/features/output/details.component.js +++ b/awx/ui/client/features/output/details.component.js @@ -553,12 +553,16 @@ function getInstanceGroupDetails () { return null; } - const label = strings.get('labels.INSTANCE_GROUP'); const value = $filter('sanitize')(instanceGroup.name); - const link = `/#/instance_groups/${instanceGroup.id}`; + + let label = strings.get('labels.INSTANCE_GROUP'); + let link = `/#/instance_groups/${instanceGroup.id}`; + if (instanceGroup.is_containerized) { + label = strings.get('labels.CONTAINER_GROUP'); + link = `/#/instance_groups/container_group/edit/${instanceGroup.id}`; + } let isolated = null; - if (instanceGroup.is_isolated) { isolated = strings.get('details.ISOLATED'); } diff --git a/awx/ui/client/features/output/output.strings.js b/awx/ui/client/features/output/output.strings.js index dd4ddaaa0b..47b2e74883 100644 --- a/awx/ui/client/features/output/output.strings.js +++ b/awx/ui/client/features/output/output.strings.js @@ -63,6 +63,7 @@ function OutputStrings (BaseString) { FORKS: t.s('Forks'), HOST_LIMIT_ERROR: t.s('Host Limit Error'), INSTANCE_GROUP: t.s('Instance Group'), + CONTAINER_GROUP: t.s('Container Group'), INVENTORY: t.s('Inventory'), INVENTORY_SCM: t.s('Source Project'), JOB_EXPLANATION: t.s('Explanation'),