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

Fixes Credential Type Issue, ExtraVars Toggle Issue, Job Results Inert Link

Browse Source
This commit is contained in:
Alex Corey
2019-09-30 12:53:39 -04:00
committed by Shane McDonald
parent 59413e0a8f
commit 958c8a4177
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -559,7 +559,7 @@ function getInstanceGroupDetails () {
let link = `/#/instance_groups/${instanceGroup.id}`; let link = `/#/instance_groups/${instanceGroup.id}`;
if (instanceGroup.is_containerized) { if (instanceGroup.is_containerized) {
label = strings.get('labels.CONTAINER_GROUP'); label = strings.get('labels.CONTAINER_GROUP');
link = `/#/instance_groups/container_group/edit/${instanceGroup.id}`; link = `/#/instance_groups/container_group/${instanceGroup.id}`;
} }
let isolated = null; let isolated = null;

2
awx/ui/client/src/instance-groups/container-groups/edit-container-group.controller.js
View File

@@ -92,7 +92,7 @@ function EditContainerGroupController($rootScope, $scope, $state, models, string
const podSpecValue = sanitizeVars(EditContainerGroupDataset.data.pod_spec_override); const podSpecValue = sanitizeVars(EditContainerGroupDataset.data.pod_spec_override);
const defaultPodSpecValue = sanitizeVars(instanceGroup.model.OPTIONS.actions.PUT.pod_spec_override.default); const defaultPodSpecValue = sanitizeVars(instanceGroup.model.OPTIONS.actions.PUT.pod_spec_override.default);
if (podSpecValue && podSpecValue.trim() !== defaultPodSpecValue.trim()) { if ((podSpecValue !== '---') && podSpecValue && podSpecValue.trim() !== defaultPodSpecValue.trim()) {
vm.form.extraVars.isOpen = true; vm.form.extraVars.isOpen = true;
} else { } else {
vm.form.extraVars.isOpen = false; vm.form.extraVars.isOpen = false;

15
awx/ui/client/src/instance-groups/main.js
View File

@@ -199,6 +199,7 @@ function InstanceGroupsRun($stateExtender, strings) {
params: { params: {
credential_search: { credential_search: {
value: { value: {
credential_type__kind: 'kubernetes',
order_by: 'name', order_by: 'name',
page_size: 5, page_size: 5,
}, },
@@ -228,12 +229,11 @@ function InstanceGroupsRun($stateExtender, strings) {
resolve: { resolve: {
ListDefinition: ['CredentialList', list => list], ListDefinition: ['CredentialList', list => list],
Dataset: ['ListDefinition', 'QuerySet', '$stateParams', 'GetBasePath', (list, qs, $stateParams, GetBasePath) => { Dataset: ['ListDefinition', 'QuerySet', '$stateParams', 'GetBasePath', (list, qs, $stateParams, GetBasePath) => {
const params = {
credential_type__kind: 'kubernetes',
};
const searchPath = GetBasePath('credentials'); const searchPath = GetBasePath('credentials');
return qs.search( return qs.search(
searchPath, params, searchPath,
$stateParams[`${list.iterator}_search`] $stateParams[`${list.iterator}_search`]
); );
}] }]
@@ -257,6 +257,7 @@ function InstanceGroupsRun($stateExtender, strings) {
controllerAs: 'vm' controllerAs: 'vm'
} }
}, },
resolve: { resolve: {
resolvedModels: InstanceGroupsResolve, resolvedModels: InstanceGroupsResolve,
EditContainerGroupDataset: ['GetBasePath', 'QuerySet', '$stateParams', EditContainerGroupDataset: ['GetBasePath', 'QuerySet', '$stateParams',
@@ -278,6 +279,7 @@ function InstanceGroupsRun($stateExtender, strings) {
params: { params: {
credential_search: { credential_search: {
value: { value: {
credential_type__kind: 'kubernetes',
order_by: 'name', order_by: 'name',
page_size: 5, page_size: 5,
}, },
@@ -304,12 +306,9 @@ function InstanceGroupsRun($stateExtender, strings) {
resolve: { resolve: {
ListDefinition: ['CredentialList', list => list], ListDefinition: ['CredentialList', list => list],
Dataset: ['ListDefinition', 'QuerySet', '$stateParams', 'GetBasePath', (list, qs, $stateParams, GetBasePath) => { Dataset: ['ListDefinition', 'QuerySet', '$stateParams', 'GetBasePath', (list, qs, $stateParams, GetBasePath) => {
const params = {
credential_type__kind: 'kubernetes',
};
const searchPath = GetBasePath('credentials'); const searchPath = GetBasePath('credentials');
return qs.search( return qs.search(
searchPath, params, searchPath,
$stateParams[`${list.iterator}_search`] $stateParams[`${list.iterator}_search`]
); );
}] }]