From fcd759fa1f84d414ee34569fd2cd042d0913f9fa Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Mon, 21 Jan 2019 13:52:47 -0500
Subject: [PATCH 1/2] add timeout field to ui

---
 .../job_templates/job-template.form.js        | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/awx/ui/client/src/templates/job_templates/job-template.form.js b/awx/ui/client/src/templates/job_templates/job-template.form.js
index 5dae998c76..989429e163 100644
--- a/awx/ui/client/src/templates/job_templates/job-template.form.js
+++ b/awx/ui/client/src/templates/job_templates/job-template.form.js
@@ -141,18 +141,15 @@ function(NotificationsList, i18n) {
                 },
                 forks: {
                     label: i18n._('Forks'),
-                    id: 'forks-number',
                     type: 'number',
                     integer: true,
-                    min: 1,
+                    min: 0,
+                    default: 0,
                     spinner: true,
-                    'class': "input-small",
-                    column: 1,
-                    awPopOver: i18n._('The number of parallel or simultaneous processes to use while executing the playbook. Value defaults to 0. Refer to the Ansible documentation for details about the configuration file.'),
-                    placeholder: 'DEFAULT',
                     dataTitle: i18n._('Forks'),
                     dataPlacement: 'right',
-                    dataContainer: "body",
+                    dataContainer: 'body',
+                    awPopOver: "<p>" + i18n._("The number of parallel or simultaneous processes to use while executing the playbook. Value defaults to 0. Refer to the Ansible documentation for details about the configuration file.") + "</p>",
                     ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)'
                 },
                 limit: {
@@ -270,6 +267,19 @@ function(NotificationsList, i18n) {
                     awPopOver: "<p>" + i18n._("Divide the work done by this job template into the specified number of job slices, each running the same tasks against a portion of the inventory.") + "</p>",
                     ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)'
                 },
+                timeout: {
+                    label: i18n._('Timeout'),
+                    type: 'number',
+                    integer: true,
+                    min: 0,
+                    default: 0,
+                    spinner: true,
+                    dataTitle: i18n._('Timeout'),
+                    dataPlacement: 'right',
+                    dataContainer: 'body',
+                    awPopOver: "<p>" + i18n._("The amount of time (in seconds) to run before the task is canceled.  Defaults to 0, which means the job will not timeout.") + "</p>",
+                    ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)'
+                },
                 diff_mode: {
                     label: i18n._('Show Changes'),
                     type: 'toggleSwitch',

From e95da84e5a2a62903e918ba27d2e7ed70bdda009 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Tue, 22 Jan 2019 13:48:57 -0500
Subject: [PATCH 2/2] make forks fill for value of 0 and update timeout help
 text based on docs feedback

---
 .../edit-job-template/job-template-edit.controller.js     | 8 +-------
 .../src/templates/job_templates/job-template.form.js      | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
index b2f88af137..2ee7ec158b 100644
--- a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
+++ b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
@@ -282,7 +282,7 @@ export default
                 $scope.breadcrumb.job_template_name = jobTemplateData.name;
                 var fld, i;
                 for (fld in form.fields) {
-                    if (fld !== 'extra_vars' && fld !== 'survey' && fld !== 'forks' && jobTemplateData[fld] !== null && jobTemplateData[fld] !== undefined) {
+                    if (fld !== 'extra_vars' && fld !== 'survey' && jobTemplateData[fld] !== null && jobTemplateData[fld] !== undefined) {
                         if (form.fields[fld].type === 'select') {
                             if ($scope[fld + '_options'] && $scope[fld + '_options'].length > 0) {
                                 for (i = 0; i < $scope[fld + '_options'].length; i++) {
@@ -301,12 +301,6 @@ export default
                         }
                         master[fld] = $scope[fld];
                     }
-                    if (fld === 'forks') {
-                        if (jobTemplateData[fld] !== 0) {
-                            $scope[fld] = jobTemplateData[fld];
-                            master[fld] = $scope[fld];
-                        }
-                    }
                     if (fld === 'extra_vars') {
                         // Parse extra_vars, converting to YAML.
                         $scope.extra_vars = ParseVariableString(jobTemplateData.extra_vars);
diff --git a/awx/ui/client/src/templates/job_templates/job-template.form.js b/awx/ui/client/src/templates/job_templates/job-template.form.js
index 989429e163..3c966e1517 100644
--- a/awx/ui/client/src/templates/job_templates/job-template.form.js
+++ b/awx/ui/client/src/templates/job_templates/job-template.form.js
@@ -277,7 +277,7 @@ function(NotificationsList, i18n) {
                     dataTitle: i18n._('Timeout'),
                     dataPlacement: 'right',
                     dataContainer: 'body',
-                    awPopOver: "<p>" + i18n._("The amount of time (in seconds) to run before the task is canceled.  Defaults to 0, which means the job will not timeout.") + "</p>",
+                    awPopOver: "<p>" + i18n._("The amount of time (in seconds) to run before the task is canceled. Defaults to 0 for no job timeout.") + "</p>",
                     ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)'
                 },
                 diff_mode: {