From c6b2e56100901c98a161367162c1681c98851020 Mon Sep 17 00:00:00 2001 From: Michael Abashian Date: Tue, 7 Feb 2017 17:46:32 -0500 Subject: [PATCH 1/2] Remove prompt for inv/prompt for cred results from the wf editor jt list --- awx/ui/client/src/templates/main.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/awx/ui/client/src/templates/main.js b/awx/ui/client/src/templates/main.js index 887e362e02..8cbbf8dd1f 100644 --- a/awx/ui/client/src/templates/main.js +++ b/awx/ui/client/src/templates/main.js @@ -102,8 +102,9 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplatesA job_template_search: { value: { page_size: '5', - type: 'job_template', - order_by: 'name' + order_by: 'name', + inventory__isnull: false, + credential__isnull: false }, squash: true, dynamic: true @@ -450,7 +451,7 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplatesA ], WorkflowMakerJobTemplateList: ['TemplateList', (TemplateList) => { - let list = _.cloneDeep(TemplateList); + let list = _.cloneDeep(TemplateList);//foobar delete list.fields.type; delete list.fields.description; delete list.fields.smart_status; @@ -459,6 +460,7 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplatesA list.fields.name.columnClass = "col-md-8"; list.iterator = 'job_template'; list.name = 'job_templates'; + list.basePath = "job_templates"; list.fields.info = { ngInclude: "'/static/partials/job-template-details.html'", type: 'template', From 2eafa76fac6c86f40fda3cb273d1c84982e5ed3e Mon Sep 17 00:00:00 2001 From: Michael Abashian Date: Wed, 8 Feb 2017 11:55:31 -0500 Subject: [PATCH 2/2] Removed escape-proned rogue foobar --- awx/ui/client/src/templates/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/client/src/templates/main.js b/awx/ui/client/src/templates/main.js index 8cbbf8dd1f..e53e0660d7 100644 --- a/awx/ui/client/src/templates/main.js +++ b/awx/ui/client/src/templates/main.js @@ -451,7 +451,7 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplatesA ], WorkflowMakerJobTemplateList: ['TemplateList', (TemplateList) => { - let list = _.cloneDeep(TemplateList);//foobar + let list = _.cloneDeep(TemplateList); delete list.fields.type; delete list.fields.description; delete list.fields.smart_status;