From c2d4887043e8f80acc7fe4e0f26600b1971bfa78 Mon Sep 17 00:00:00 2001
From: Marliana Lara <mlara@redhat.com>
Date: Sat, 6 Oct 2018 17:15:46 -0400
Subject: [PATCH] Include workflow jobs in workflow maker job templates list

---
 awx/ui/client/src/templates/main.js                          | 5 +++--
 .../workflows/workflow-maker/workflow-maker.partial.html     | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/awx/ui/client/src/templates/main.js b/awx/ui/client/src/templates/main.js
index 61d04b6b82..85e3d08f59 100644
--- a/awx/ui/client/src/templates/main.js
+++ b/awx/ui/client/src/templates/main.js
@@ -419,7 +419,8 @@ angular.module('templates', [surveyMaker.name, jobTemplates.name, labels.name, p
                         job_template_search: {
                             value: {
                                 page_size: '5',
-                                order_by: 'name'
+                                order_by: 'name',
+                                role_level: 'execute_role'
                             },
                             squash: false,
                             dynamic: true
@@ -712,7 +713,7 @@ angular.module('templates', [surveyMaker.name, jobTemplates.name, labels.name, p
                                 list.disableRowValue = '!workflowJobTemplateObj.summary_fields.user_capabilities.edit';
                                 list.iterator = 'job_template';
                                 list.name = 'job_templates';
-                                list.basePath = "job_templates";
+                                list.basePath = 'unified_job_templates';
                                 list.fields.info = {
                                     ngInclude: "'/static/partials/job-template-details.html'",
                                     type: 'template',
diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html
index e27118163c..3f3fb5c14f 100644
--- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html
+++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html
@@ -94,7 +94,7 @@
                     <div id="workflow-inventory-sync-list" ui-view="inventorySyncList" ng-show="workflowMakerFormConfig.activeTab === 'inventory_sync'"></div>
                 </div>
                 <span ng-show="selectedTemplate &&
-                    ((selectedTemplate.type === 'job_template' && workflowMakerFormConfig.activeTab === 'jobs') ||
+                    ((selectedTemplate.type === 'job_template' || selectedTemplate.type === 'workflow_job_template' && workflowMakerFormConfig.activeTab === 'jobs') ||
                     (selectedTemplate.type === 'project' && workflowMakerFormConfig.activeTab === 'project_sync') ||
                     (selectedTemplate.type === 'inventory_source' && workflowMakerFormConfig.activeTab === 'inventory_sync'))">
                     <div ng-if="selectedTemplate && selectedTemplateInvalid">