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

fix open in new tab for credentials and inventory scripts

Browse Source
This commit is contained in:
John Mitchell
2018-04-20 16:00:57 -04:00
parent 3f509d5ae8
commit ee137b8b4d
2 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
awx/ui/client/src/credential-types/main.js
View File

@@ -25,10 +25,8 @@ angular.module('credentialTypes', [
function($stateProvider, stateDefinitionsProvider) { function($stateProvider, stateDefinitionsProvider) {
let stateDefinitions = stateDefinitionsProvider.$get(); let stateDefinitions = stateDefinitionsProvider.$get();
$stateProvider.state({ function generateStateTree() {
name: 'credentialTypes.**', let credentialTypesTree = stateDefinitions.generateTree({
url: '/credential_type',
lazyLoad: () => stateDefinitions.generateTree({
parent: 'credentialTypes', parent: 'credentialTypes',
modes: ['add', 'edit'], modes: ['add', 'edit'],
list: 'CredentialTypesList', list: 'CredentialTypesList',
@@ -45,7 +43,22 @@ angular.module('credentialTypes', [
ncyBreadcrumb: { ncyBreadcrumb: {
label: N_('CREDENTIAL TYPES') label: N_('CREDENTIAL TYPES')
} }
}) });
}); return Promise.all([
credentialTypesTree
]).then((generated) => {
return {
states: _.reduce(generated, (result, definition) => {
return result.concat(definition.states);
}, [])
};
});
}
let stateTree = {
name: 'credentialTypes.**',
url: '/credential_types',
lazyLoad: () => generateStateTree()
};
$stateProvider.state(stateTree);
} }
]); ]);

26
awx/ui/client/src/inventory-scripts/main.js
View File

@@ -25,10 +25,8 @@ angular.module('inventoryScripts', [
function($stateProvider, stateDefinitionsProvider) { function($stateProvider, stateDefinitionsProvider) {
let stateDefinitions = stateDefinitionsProvider.$get(); let stateDefinitions = stateDefinitionsProvider.$get();
$stateProvider.state({ function generateStateTree() {
name: 'inventoryScripts.**', let inventoryScriptTree = stateDefinitions.generateTree({
url: '/inventory_script',
lazyLoad: () => stateDefinitions.generateTree({
parent: 'inventoryScripts', parent: 'inventoryScripts',
modes: ['add', 'edit'], modes: ['add', 'edit'],
list: 'InventoryScriptsList', list: 'InventoryScriptsList',
@@ -66,7 +64,23 @@ angular.module('inventoryScripts', [
ncyBreadcrumb: { ncyBreadcrumb: {
label: N_('INVENTORY SCRIPTS') label: N_('INVENTORY SCRIPTS')
} }
}) });
});
return Promise.all([
inventoryScriptTree
]).then((generated) => {
return {
states: _.reduce(generated, (result, definition) => {
return result.concat(definition.states);
}, [])
};
});
}
let stateTree = {
name: 'inventoryScripts.**',
url: '/inventory_scripts',
lazyLoad: () => generateStateTree()
};
$stateProvider.state(stateTree);
} }
]); ]);