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

Merge pull request #3992 from marshmalien/isolated-badge

Browse Source 
Add isolated badge to isolated instance groups

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-06-05 16:58:20 +00:00
committed by GitHub
parent 3fcf3b20c4 abb37299cb
commit c7f49c1193
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -527,7 +527,7 @@ function getInstanceGroupDetails () {
let isolated = null; let isolated = null;
if (instanceGroup.controller_id) { if (instanceGroup.is_isolated) {
isolated = strings.get('details.ISOLATED'); isolated = strings.get('details.ISOLATED');
} }

3
awx/ui/client/src/instance-groups/instance-groups.strings.js
View File

@@ -14,6 +14,7 @@ function InstanceGroupsStrings (BaseString) {
MANUAL: t.s('MANUAL'), MANUAL: t.s('MANUAL'),
PANEL_TITLE: t.s('INSTANCE GROUPS'), PANEL_TITLE: t.s('INSTANCE GROUPS'),
ROW_ITEM_LABEL_INSTANCES: t.s('Instances'), 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_RUNNING_JOBS: t.s('Running Jobs'),
ROW_ITEM_LABEL_TOTAL_JOBS: t.s('Total Jobs'), ROW_ITEM_LABEL_TOTAL_JOBS: t.s('Total Jobs'),
ROW_ITEM_LABEL_USED_CAPACITY: t.s('Used Capacity') ROW_ITEM_LABEL_USED_CAPACITY: t.s('Used Capacity')
@@ -58,7 +59,7 @@ function InstanceGroupsStrings (BaseString) {
DELETE: t.s('Unable to delete instance group.'), DELETE: t.s('Unable to delete instance group.'),
}; };
ns.alert = { ns.alert = {
MISSING_PARAMETER: t.s('Instance Group parameter is missing.'), MISSING_PARAMETER: t.s('Instance Group parameter is missing.'),
}; };
} }

4
awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
View File

@@ -45,7 +45,9 @@
<div class="at-Row-items"> <div class="at-Row-items">
<at-row-item <at-row-item
header-value="{{ instance_group.name }}" header-value="{{ instance_group.name }}"
header-link="/#/instance_groups/{{ instance_group.id }}"> header-link="/#/instance_groups/{{ instance_group.id }}"
header-tag="{{ instance_group.is_isolated ? vm.strings.get('list.ROW_ITEM_LABEL_ISOLATED') : '' }}"
>
</at-row-item> </at-row-item>
<div class="at-Row--inline"> <div class="at-Row--inline">