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

added defaultText option for forms

Browse Source 
the default text in a select input field can now be configured
This commit is contained in:
Jared Tabor 2014-10-16 00:30:24 -04:00
parent df789f0c96
commit 2e4fd96aef
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/static/js/forms/SurveyQuestion.js
View File

@ -52,6 +52,7 @@ angular.module('SurveyQuestionFormDefinition', [])
realName: 'answer_type',
label: 'Answer Type',
type: 'select',
defaultText: 'Choose an answer type',
ngOptions: 'answer_types.name for answer_types in answer_types track by answer_types.type',
addRequired: true,
editRequired: true,

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

@ -77,6 +77,7 @@
* | dataPlacement | Used with awPopOver and awToolTip. String providing the placement parameter (i.e. left, right, top, bottom, etc.). |
* | dataTitle | Used with awPopOver. String value for the title of the popover. |
* | default | Default value to place in the field when the form is in 'add' mode. |
* | defaultText | Default value to put into a select input. |
* | editRequird | true or false. If true, set the required attribute when mode is 'edit'. |
* | falseValue | For radio buttons and checkboxes. Value to set the model to when the checkbox or radio button is not selected. |
* | genMD5 | true or false. If true, places the field in an input group with a button that when clicked replaces the field contents with an MD5 has key. Used with host_config_key on the job templates detail page. |
@ -907,15 +908,11 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator
field.awRequiredWhen.variable + "\" " : "";
html += ">\n";
html += "<option value=\"\">";
//for survey maker, needed the select drop down to say "select an answer type"
if(form.name === "question_unique"){
html += (field.defaultOption) ? field.defaultOption : "Choose an " + field.label.toLowerCase();
} else{
html += (field.defaultOption) ? field.defaultOption : "Choose a " + field.label.toLowerCase();
}
// Add a custom default select 'value' (default text)
html += (field.defaultText) ? field.defaultText : "Choose a " + field.label.toLowerCase();
html += "</option>\n";
html += "</select>\n";
// Add error messages
// Add error messages
if ((options.mode === 'add' && field.addRequired) || (options.mode === 'edit' && field.editRequired) ||
field.awRequiredWhen) {
html += "<div class=\"error\" id=\"" + this.form.name + "-" + fld + "-required-error\" ng-show=\"" + this.form.name + '_form.' + fld + ".$dirty && " +