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] 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',