External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 17:37:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

link to container group from job runs

Browse Source
This commit is contained in:
Jake McDermott
2019-09-03 14:28:33 -04:00
committed by Shane McDonald
parent 007f33c186
commit b547a8c3ca
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/serializers.py
View File

@@ -135,7 +135,7 @@ SUMMARIZABLE_FK_FIELDS = {
'source_script': ('name', 'description'), 'source_script': ('name', 'description'),
'role': ('id', 'role_field'), 'role': ('id', 'role_field'),
'notification_template': DEFAULT_SUMMARY_FIELDS, 'notification_template': DEFAULT_SUMMARY_FIELDS,
'instance_group': ('id', 'name', 'controller_id'), 'instance_group': ('id', 'name', 'controller_id', 'is_containerized'),
'insights_credential': DEFAULT_SUMMARY_FIELDS, 'insights_credential': DEFAULT_SUMMARY_FIELDS,
'source_credential': DEFAULT_SUMMARY_FIELDS + ('kind', 'cloud', 'credential_type_id'), 'source_credential': DEFAULT_SUMMARY_FIELDS + ('kind', 'cloud', 'credential_type_id'),
'target_credential': DEFAULT_SUMMARY_FIELDS + ('kind', 'cloud', 'credential_type_id'), 'target_credential': DEFAULT_SUMMARY_FIELDS + ('kind', 'cloud', 'credential_type_id'),

10
awx/ui/client/features/output/details.component.js
View File

@@ -553,12 +553,16 @@ function getInstanceGroupDetails () {
return null; return null;
} }
const label = strings.get('labels.INSTANCE_GROUP');
const value = $filter('sanitize')(instanceGroup.name); 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; let isolated = null;
if (instanceGroup.is_isolated) { if (instanceGroup.is_isolated) {
isolated = strings.get('details.ISOLATED'); isolated = strings.get('details.ISOLATED');
} }

1
awx/ui/client/features/output/output.strings.js
View File

@@ -63,6 +63,7 @@ function OutputStrings (BaseString) {
FORKS: t.s('Forks'), FORKS: t.s('Forks'),
HOST_LIMIT_ERROR: t.s('Host Limit Error'), HOST_LIMIT_ERROR: t.s('Host Limit Error'),
INSTANCE_GROUP: t.s('Instance Group'), INSTANCE_GROUP: t.s('Instance Group'),
CONTAINER_GROUP: t.s('Container Group'),
INVENTORY: t.s('Inventory'), INVENTORY: t.s('Inventory'),
INVENTORY_SCM: t.s('Source Project'), INVENTORY_SCM: t.s('Source Project'),
JOB_EXPLANATION: t.s('Explanation'), JOB_EXPLANATION: t.s('Explanation'),