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

Fixed clear-all on inventory source credential lookup

Browse Source
This commit is contained in:
mabashian
2018-06-11 16:07:50 -04:00
parent 769e714f71
commit a3368a8c96
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/inventories-hosts/inventories/main.js
View File

@@ -252,7 +252,6 @@ angular.module('inventory', [
let addSourceCredential = _.cloneDeep(inventorySourcesCredentialRoute); let addSourceCredential = _.cloneDeep(inventorySourcesCredentialRoute);
addSourceCredential.name = 'inventories.edit.inventory_sources.add.credential'; addSourceCredential.name = 'inventories.edit.inventory_sources.add.credential';
addSourceCredential.url = '/credential';
let addSourceInventoryScript = _.cloneDeep(inventorySourcesInventoryScriptRoute); let addSourceInventoryScript = _.cloneDeep(inventorySourcesInventoryScriptRoute);
addSourceInventoryScript.name = 'inventories.edit.inventory_sources.add.inventory_script'; addSourceInventoryScript.name = 'inventories.edit.inventory_sources.add.inventory_script';
@@ -260,7 +259,6 @@ angular.module('inventory', [
let editSourceCredential = _.cloneDeep(inventorySourcesCredentialRoute); let editSourceCredential = _.cloneDeep(inventorySourcesCredentialRoute);
editSourceCredential.name = 'inventories.edit.inventory_sources.edit.credential'; editSourceCredential.name = 'inventories.edit.inventory_sources.edit.credential';
editSourceCredential.url = '/credential';
let addSourceProject = _.cloneDeep(inventorySourcesProjectRoute); let addSourceProject = _.cloneDeep(inventorySourcesProjectRoute);
addSourceProject.name = 'inventories.edit.inventory_sources.add.project'; addSourceProject.name = 'inventories.edit.inventory_sources.add.project';

7
awx/ui/client/src/inventories-hosts/inventories/related/sources/lookup/sources-lookup-credential.route.js
View File

@@ -36,8 +36,11 @@ export default {
ListDefinition: ['CredentialList', function(list) { ListDefinition: ['CredentialList', function(list) {
return list; return list;
}], }],
Dataset: ['ListDefinition', 'QuerySet', '$stateParams', 'GetBasePath', Dataset: ['ListDefinition', 'QuerySet', '$stateParams', 'GetBasePath', '$transition$',
(list, qs, $stateParams, GetBasePath) => { (list, qs, $stateParams, GetBasePath, $transition$) => {
let toState = $transition$.to();
toState.params.credential_search.value.kind = _.get($stateParams, 'credential_search.kind', null);
toState.params.credential_search.value.credential_type__kind = _.get($stateParams, 'credential_search.credential_type__kind', null);
return qs.search(GetBasePath('credentials'), $stateParams[`${list.iterator}_search`]); return qs.search(GetBasePath('credentials'), $stateParams[`${list.iterator}_search`]);
} }
] ]