From 745209d3625ebfb0e48f4b29e999361158196771 Mon Sep 17 00:00:00 2001 From: Leigh Johnson Date: Tue, 12 Jul 2016 15:49:25 -0400 Subject: [PATCH 1/2] init search with correct query param, resolves #2947 --- awx/ui/client/src/helpers/JobTemplates.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/awx/ui/client/src/helpers/JobTemplates.js b/awx/ui/client/src/helpers/JobTemplates.js index 1dbbe33584..7db3e3cb2e 100644 --- a/awx/ui/client/src/helpers/JobTemplates.js +++ b/awx/ui/client/src/helpers/JobTemplates.js @@ -162,6 +162,8 @@ angular.module('JobTemplatesHelper', ['Utilities']) input_type: "radio" }); + CredentialList.basePath = GetBasePath('credentials') + '?kind=ssh'; + LookUpInit({ url: GetBasePath('credentials') + '?kind=ssh', scope: scope, From 03a04268cf2e174de63f01e361e1033749777214 Mon Sep 17 00:00:00 2001 From: Leigh Johnson Date: Tue, 12 Jul 2016 17:11:10 -0400 Subject: [PATCH 2/2] fix prompt-for machine cred query params too --- awx/ui/client/src/job-submission/job-submission.controller.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/awx/ui/client/src/job-submission/job-submission.controller.js b/awx/ui/client/src/job-submission/job-submission.controller.js index 00c7e971d3..7c3421e551 100644 --- a/awx/ui/client/src/job-submission/job-submission.controller.js +++ b/awx/ui/client/src/job-submission/job-submission.controller.js @@ -134,7 +134,7 @@ export default var base = $state.current.name, // As of 3.0, the only place the user can relaunch a // playbook is on jobTemplates.edit (completed_jobs tab), - // jobs, and jobDetails $states. + // jobs, and jobDetails $states. isRelaunch = !(base === 'jobTemplates' || base === 'portalMode' || base === 'dashboard'); if (!isRelaunch) { @@ -333,6 +333,7 @@ export default var credential_url = GetBasePath('credentials') + '?kind=ssh'; var credList = _.cloneDeep(CredentialList); + credList.basePath = GetBasePath('credentials') + '?kind=ssh'; credList.fields.description.searchable = false; credList.fields.kind.searchable = false;