External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-10 04:29:21 -02:30
Code Issues Packages Projects Releases Wiki Activity

AC-318 fixed Forks tooltip and validation on Job Templates page

Browse Source
This commit is contained in:
chouseknecht
2013-09-03 18:23:58 -04:00
parent eae151ba31
commit 25a2e32082
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/static/js/forms/JobTemplates.js
View File

@@ -91,15 +91,13 @@ angular.module('JobTemplateFormDefinition', [])
type: 'number', type: 'number',
integer: true, integer: true,
min: 0, min: 0,
max: null,
spinner: true, spinner: true,
"default": '0', "default": '0',
addRequired: false, addRequired: false,
editRequired: false, editRequired: false,
'class': "input-small", 'class': "input-small",
column: 1, column: 1,
awPopOver: "<p>The number of parallel or simultaneous processes to use while executing the playbook. Provide a value between 0 and 100. " + awPopOver: "<p>The number of parallel or simultaneous processes to use while executing the playbook.</p>",
"A value of zero will use the ansible default setting of 5 parallel processes.</p>",
dataTitle: 'Forks', dataTitle: 'Forks',
dataPlacement: 'right', dataPlacement: 'right',
dataContainer: "body" dataContainer: "body"

4
awx/ui/static/js/forms/Jobs.js
View File

@@ -91,7 +91,6 @@ angular.module('JobFormDefinition', [])
type: 'number', type: 'number',
integer: true, integer: true,
min: 0, min: 0,
max: null,
spinner: true, spinner: true,
"class": 'input-small', "class": 'input-small',
"default": '0', "default": '0',
@@ -99,8 +98,7 @@ angular.module('JobFormDefinition', [])
editRequired: false, editRequired: false,
column: 1, column: 1,
disabled: true, disabled: true,
awPopOver: "<p>The number of parallel or simultaneous processes to use while executing the playbook. Provide a value between 0 and 100. " + awPopOver: "<p>The number of parallel or simultaneous processes to use while executing the playbook.</p>",
"A value of zero will use the ansible default setting of 5 parallel processes.</p>",
dataContainer: 'body', dataContainer: 'body',
dataTitle: 'Forks', dataTitle: 'Forks',
dataPlacement: 'right' dataPlacement: 'right'

8
awx/ui/static/lib/ansible/form-generator.js
View File

@@ -92,7 +92,6 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
this.scope.formModalActionDisabled = false; this.scope.formModalActionDisabled = false;
if (form) { if (form) {
this.scope.formModalHeader = (options.mode == 'add') ? form.addTitle : form.editTitle; //Default title for default modal this.scope.formModalHeader = (options.mode == 'add') ? form.addTitle : form.editTitle; //Default title for default modal
console.log('header: ' + this.scope.formHeader);
} }
this.scope.formModalInfo = false //Disable info button for default modal this.scope.formModalInfo = false //Disable info button for default modal
if (options.modal_selector) { if (options.modal_selector) {
@@ -545,10 +544,11 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
if (field.integer) { if (field.integer) {
html += "<div class=\"error\" ng-show=\"" + this.form.name + '_form.' + fld + ".$error.integer\">Must be an integer value</div>\n"; html += "<div class=\"error\" ng-show=\"" + this.form.name + '_form.' + fld + ".$error.integer\">Must be an integer value</div>\n";
} }
if (field.min || field.max) { if (field.min !== undefined || field.max !== undefined) {
html += "<div class=\"error\" ng-show=\"" + this.form.name + '_form.' + fld + ".$error.min || " + html += "<div class=\"error\" ng-show=\"" + this.form.name + '_form.' + fld + ".$error.min || " +
this.form.name + '_form.' + fld + ".$error.max\">Must be in range " + field.min + " to " + this.form.name + '_form.' + fld + ".$error.max\">Must be an integer between " + field.min + " and ";
field.max + "</div>\n"; html += (field.max !== undefined) ? field.max : 'unlimited';
html += "</div>\n";
} }
html += "<div class=\"error api-error\" ng-bind=\"" + fld + "_api_error\"></div>\n"; html += "<div class=\"error api-error\" ng-bind=\"" + fld + "_api_error\"></div>\n";
html += "</div>\n"; html += "</div>\n";