External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-26 23:46:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

Include workflow jobs in workflow maker job templates list

Browse Source
This commit is contained in:
Marliana Lara
2018-10-06 17:15:46 -04:00
parent 4428dbf1ff
commit c2d4887043
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/client/src/templates/main.js
View File

@@ -419,7 +419,8 @@ angular.module('templates', [surveyMaker.name, jobTemplates.name, labels.name, p
job_template_search: { job_template_search: {
value: { value: {
page_size: '5', page_size: '5',
order_by: 'name' order_by: 'name',
role_level: 'execute_role'
}, },
squash: false, squash: false,
dynamic: true 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.disableRowValue = '!workflowJobTemplateObj.summary_fields.user_capabilities.edit';
list.iterator = 'job_template'; list.iterator = 'job_template';
list.name = 'job_templates'; list.name = 'job_templates';
list.basePath = "job_templates"; list.basePath = 'unified_job_templates';
list.fields.info = { list.fields.info = {
ngInclude: "'/static/partials/job-template-details.html'", ngInclude: "'/static/partials/job-template-details.html'",
type: 'template', type: 'template',

2
awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html
View File

@@ -94,7 +94,7 @@
<div id="workflow-inventory-sync-list" ui-view="inventorySyncList" ng-show="workflowMakerFormConfig.activeTab === 'inventory_sync'"></div> <div id="workflow-inventory-sync-list" ui-view="inventorySyncList" ng-show="workflowMakerFormConfig.activeTab === 'inventory_sync'"></div>
</div> </div>
<span ng-show="selectedTemplate && <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 === 'project' && workflowMakerFormConfig.activeTab === 'project_sync') ||
(selectedTemplate.type === 'inventory_source' && workflowMakerFormConfig.activeTab === 'inventory_sync'))"> (selectedTemplate.type === 'inventory_source' && workflowMakerFormConfig.activeTab === 'inventory_sync'))">
<div ng-if="selectedTemplate && selectedTemplateInvalid"> <div ng-if="selectedTemplate && selectedTemplateInvalid">