From 57883e37bf68a84d35a946484dcbd021b219b110 Mon Sep 17 00:00:00 2001 From: jaredevantabor Date: Wed, 8 Feb 2017 16:36:53 -0800 Subject: [PATCH] Adding default params for some lookup modals the organization and inventory-script lookup modals require some additional default params set to properly present the user w/ options they have permission to see. If these default params aren't set, they'll show up as search tags, which we don't want. --- .../src/shared/stateDefinitions.factory.js | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/awx/ui/client/src/shared/stateDefinitions.factory.js b/awx/ui/client/src/shared/stateDefinitions.factory.js index f6f0bf1950..f24ec4993d 100644 --- a/awx/ui/client/src/shared/stateDefinitions.factory.js +++ b/awx/ui/client/src/shared/stateDefinitions.factory.js @@ -646,6 +646,32 @@ export default ['$injector', '$stateExtender', '$log', 'i18n', function($injecto generateLookupNodes: function(form, formStateDefinition) { function buildFieldDefinition(field) { + + // Some lookup modals require some additional default params, + // namely organization and inventory_script. If these params + // aren't set as default params out of the gate, then smart + // search will think they need to be set as search tags. + var params; + if(field.sourceModel === "organization"){ + params = { + page_size: '5', + role_level: 'admin_role' + }; + } + else if(field.sourceModel === "inventory_script"){ + params = { + page_size: '5', + role_level: 'admin_role', + organization: null + }; + } + else { + params = { + page_size: '5', + role_level: 'use_role' + }; + } + let state = $stateExtender.buildDefinition({ searchPrefix: field.sourceModel, //squashSearchUrl: true, @issue enable @@ -658,10 +684,7 @@ export default ['$injector', '$stateExtender', '$log', 'i18n', function($injecto }, params: { [field.sourceModel + '_search']: { - value: { - page_size: '5', - role_level: 'use_role' - } + value: params } }, ncyBreadcrumb: {