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

Merge pull request #5150 from jlmitch5/nullPromptField

Browse Source 
fix erros with promptable lookups
This commit is contained in:
jlmitch5
2017-02-03 11:39:18 -05:00
committed by GitHub
parent f74396158e 1d590c0dd3
commit 3f098b1167
3 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/client/src/forms/JobTemplates.js
View File

@@ -89,6 +89,7 @@ export default
dataContainer: "body", dataContainer: "body",
subCheckbox: { subCheckbox: {
variable: 'ask_inventory_on_launch', variable: 'ask_inventory_on_launch',
ngChange: 'job_template_form.inventory_name.$validate()',
ngShow: "!job_type.value || job_type.value !== 'scan'", ngShow: "!job_type.value || job_type.value !== 'scan'",
text: i18n._('Prompt on launch') text: i18n._('Prompt on launch')
}, },
@@ -158,7 +159,8 @@ export default
dataContainer: "body", dataContainer: "body",
subCheckbox: { subCheckbox: {
variable: 'ask_credential_on_launch', variable: 'ask_credential_on_launch',
text: i18n._('Prompt on launch') text: i18n._('Prompt on launch'),
ngChange: 'job_template_form.credential_name.$validate()',
}, },
ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)' ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)'
}, },
@@ -396,7 +398,7 @@ export default
}, },
save: { save: {
ngClick: 'formSave()', //$scope.function to call on click, optional ngClick: 'formSave()', //$scope.function to call on click, optional
ngDisabled: "job_templates_form.$invalid",//true //Disable when $pristine or $invalid, optional and when can_edit = false, for permission reasons ngDisabled: "job_template_form.$invalid",//true //Disable when $pristine or $invalid, optional and when can_edit = false, for permission reasons
ngShow: '(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)' ngShow: '(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)'
} }
}, },

20
awx/ui/client/src/shared/directives.js
View File

@@ -638,6 +638,22 @@ function(ConfigurationUtils, i18n) {
} }
function setValidity(ctrl, validity){ function setValidity(ctrl, validity){
var isRequired;
if (attrs.required) {
isRequired = true;
} else {
isRequired = false;
}
if (attrs.awRequiredWhen) {
if (attrs.awRequiredWhen.charAt(0) === "!") {
isRequired = !scope[attrs.awRequiredWhen.slice(1, attrs.awRequiredWhen.length)];
} else {
isRequired = scope[attrs.awRequiredWhen];
}
}
if (!isRequired && (viewValue === undefined || viewValue === undefined || viewValue === "")) {
validity = true;
}
ctrl.$setValidity('awlookup', validity); ctrl.$setValidity('awlookup', validity);
return defer.resolve(validity); return defer.resolve(validity);
} }
@@ -977,9 +993,9 @@ function(ConfigurationUtils, i18n) {
ctrl.$setValidity('max', true); ctrl.$setValidity('max', true);
ctrl.$dirty = true; ctrl.$dirty = true;
ctrl.$render(); ctrl.$render();
if (scope.job_templates_form) { if (scope.job_template_form) {
// need a way to find the parent form and mark it dirty // need a way to find the parent form and mark it dirty
scope.job_templates_form.$dirty = true; scope.job_template_form.$dirty = true;
} }
if (!scope.$$phase) { if (!scope.$$phase) {
scope.$digest(); scope.$digest();

19
awx/ui/client/src/shared/form-generator.js
View File

@@ -1404,12 +1404,21 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
field.sourceModel + '_' + field.sourceField + ".$dirty && " + field.sourceModel + '_' + field.sourceField + ".$dirty && " +
this.form.name + '_form.' + field.sourceModel + '_' + field.sourceField + this.form.name + '_form.' + field.sourceModel + '_' + field.sourceField +
".$error.required\">" + (field.requiredErrorMsg ? field.requiredErrorMsg : i18n._("Please select a value.")) + "</div>\n"; ".$error.required\">" + (field.requiredErrorMsg ? field.requiredErrorMsg : i18n._("Please select a value.")) + "</div>\n";
html += "<div class=\"error\" id=\"" + this.form.name + "-" + fld + "-notfound-error\" ng-show=\"" +
this.form.name + '_form.' +
field.sourceModel + '_' + field.sourceField + ".$dirty && " +
this.form.name + '_form.' + field.sourceModel + '_' + field.sourceField +
".$error.awlookup && !(" + this.form.name + '_form.' +
field.sourceModel + '_' + field.sourceField + ".$dirty && " +
this.form.name + '_form.' + field.sourceModel + '_' + field.sourceField +
".$error.required)\">" + i18n._("That value was not found. Please enter or select a valid value.") + "</div>\n";
} else {
html += "<div class=\"error\" id=\"" + this.form.name + "-" + fld + "-notfound-error\" ng-show=\"" +
this.form.name + '_form.' +
field.sourceModel + '_' + field.sourceField + ".$dirty && " +
this.form.name + '_form.' + field.sourceModel + '_' + field.sourceField +
".$error.awlookup\">" + i18n._("That value was not found. Please enter or select a valid value.") + "</div>\n";
} }
html += "<div class=\"error\" id=\"" + this.form.name + "-" + fld + "-notfound-error\" ng-show=\"" +
this.form.name + '_form.' +
field.sourceModel + '_' + field.sourceField + ".$dirty && " +
this.form.name + '_form.' + field.sourceModel + '_' + field.sourceField +
".$error.awlookup\">" + i18n._("That value was not found. Please enter or select a valid value.") + "</div>\n";
html += "<div class=\"error api-error\" id=\"" + this.form.name + "-" + fld + "-api-error\" ng-bind=\"" + field.sourceModel + '_' + field.sourceField + html += "<div class=\"error api-error\" id=\"" + this.form.name + "-" + fld + "-api-error\" ng-bind=\"" + field.sourceModel + '_' + field.sourceField +
"_api_error\"></div>\n"; "_api_error\"></div>\n";
html += "</div>\n"; html += "</div>\n";