External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-24 16:01:20 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3050 from jlmitch5/jobTimeoutInUi

Browse Source 
Job timeout in ui

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-01-24 19:16:48 +00:00 committed by GitHub
commit 6726e203b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
View File

@ -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);

24
awx/ui/client/src/templates/job_templates/job-template.form.js
View File

@ -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 for no job timeout.") + "</p>",
ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)'
},
diff_mode: {
label: i18n._('Show Changes'),
type: 'toggleSwitch',