diff --git a/awx/ui/static/lib/ansible/form-generator.js b/awx/ui/static/lib/ansible/form-generator.js index 8f80490eb8..4645c3277b 100644 --- a/awx/ui/static/lib/ansible/form-generator.js +++ b/awx/ui/static/lib/ansible/form-generator.js @@ -649,23 +649,23 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator // Add error messages if ((options.mode === 'add' && field.addRequired) || (options.mode === 'edit' && field.editRequired) || field.awRequiredWhen) { - html += "
A value is required!
\n"; } if (field.type === "email") { - html += "
A valid email address is required!
\n"; } if (field.awPassMatch) { - html += "
Must match Password value
\n"; } if (field.awValidUrl) { - html += "
URL must begin with ssh, http or https and may not contain '@'
\n"; } - html += "
\n"; + html += "
\n"; if (field.chkPass) { // complexity error @@ -748,10 +748,10 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator // Add error messages if ((options.mode === 'add' && field.addRequired) || (options.mode === 'edit' && field.editRequired)) { - html += "
A value is required!
\n"; } - html += "
\n"; + html += "
\n"; html += "\n"; } @@ -787,10 +787,10 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator // Add error messages if ((options.mode === 'add' && field.addRequired) || (options.mode === 'edit' && field.editRequired) || field.awRequiredWhen) { - html += "
A value is required!
\n"; } - html += "
\n"; + html += "
\n"; // Add help panel(s) html += (field.helpCollapse) ? this.buildHelpCollapse(field.helpCollapse) : ''; @@ -833,19 +833,19 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator html += " >\n"; // Add error messages if ((options.mode === 'add' && field.addRequired) || (options.mode === 'edit' && field.editRequired)) { - html += "
A value is required!
\n"; } if (field.integer) { - html += "
Must be an integer value
\n"; + html += "
Must be an integer value
\n"; } if (field.min !== undefined || field.max !== undefined) { - html += "
Must be an integer between " + field.min + " and "; html += (field.max !== undefined) ? field.max : 'unlimited'; html += "
\n"; } - html += "
\n"; + html += "
\n"; html += "\n"; } @@ -866,18 +866,18 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator } // Add error messages if ((options.mode === 'add' && field.addRequired) || (options.mode === 'edit' && field.editRequired)) { - html += "
A value is required!
\n"; } if (field.integer) { - html += "
Must be an integer value
\n"; + html += "
Must be an integer value
\n"; } if (field.min || field.max) { - html += "
Must be in range " + field.min + " to " + field.max + "
\n"; } - html += "
\n"; + html += "
\n"; html += "\n"; html += "\n"; } @@ -901,7 +901,8 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator html += '' + field.label + ""; html += (field.awPopOver) ? this.attr(field, 'awPopOver', fld) : ""; html += "\n"; - html += "
\n"; + html += "
\n"; html += "\n"; if (horizontal) { @@ -935,10 +936,12 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator html += "\n"; } if ((options.mode === 'add' && field.addRequired) || (options.mode === 'edit' && field.editRequired)) { - html += "
A value is required!
\n"; } - html += "
\n"; + html += "
\n"; // Add help panel(s) html += (field.helpCollapse) ? this.buildHelpCollapse(field.helpCollapse) : ''; @@ -970,7 +973,8 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator html += " > "; html += field.label; html += "\n"; - html += "
\n"; + html += "
\n"; html += "\n"; if (horizontal) { @@ -1009,16 +1013,18 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator // Add error messages if ((options.mode === 'add' && field.addRequired) || (options.mode === 'edit' && field.editRequired) || field.awRequiredWhen) { - html += "
A value is required!
\n"; } - html += "
Value not found
\n"; - html += "
\n"; html += "\n"; }