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

AC-1054 came up with a fix that allows auto-form-fill browser pluggins to work. Applied to User and Credential pages.

Browse Source
This commit is contained in:
Chris Houseknecht
2014-03-27 02:29:15 -04:00
parent 4889681df3
commit 3b95fbd30b
5 changed files with 106 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -275,6 +275,21 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies', 'Utilities'])
}
},
checkAutoFill: function(params) {
var fld, model, newVal, type,
scope = (params && params.scope) ? params.scope : this.scope;
for (fld in this.form.fields) {
if (this.form.fields[fld].type === 'text' || this.form.fields[fld].type === 'textarea') {
type = (this.form.fields[fld].type === 'text') ? 'input' : 'textarea';
model = scope[this.form.name + '_form'][fld];
newVal = $(type + '[name="' + fld + '"]').val();
if (newVal && model && model.$viewValue !== newVal) {
model.$setViewValue(newVal);
}
}
}
},
addListeners: function () {
if (this.modal) {
@@ -583,7 +598,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies', 'Utilities'])
html += (field.awValidUrl) ? "aw-valid-url " : "";
html += (field.associated && this.form.fields[field.associated].ask) ? "ng-disabled=\"" + field.associated + "_ask\" " : "";
html += (field.awMultiselect) ? "aw-multiselect=\"" + field.awMultiselect + "\" " : "";
html += " >\n";
html += ">\n";
}
if (field.clear) {
@@ -705,7 +720,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies', 'Utilities'])
html += (options.mode === 'edit' && field.editRequired) ? "required " : "";
html += (options.mode === 'add' && field.addRequired) ? "required " : "";
html += (field.readonly || field.showonly) ? "readonly " : "";
html += "></textarea>\n";
html += "aw-watch ></textarea>\n";
// Add error messages
if ((options.mode === 'add' && field.addRequired) || (options.mode === 'edit' && field.editRequired)) {
@@ -1270,13 +1285,14 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies', 'Utilities'])
}
if (button.ngDisabled) {
if (btn !== 'reset') {
html += "ng-disabled=\"" + this.form.name + "_form.$pristine || " + this.form.name + "_form.$invalid";
html += (this.form.allowReadonly) ? " || " + this.form.name + "ReadOnly == true" : "";
//html += "ng-disabled=\"" + this.form.name + "_form.$pristine || " + this.form.name + "_form.$invalid";
html += "ng-disabled=\"" + this.form.name + "_form.$invalid";
//html += (this.form.allowReadonly) ? " || " + this.form.name + "ReadOnly == true" : "";
html += "\" ";
} else {
html += "ng-disabled=\"" + this.form.name + "_form.$pristine";
html += (this.form.allowReadonly) ? " || " + this.form.name + "ReadOnly == true" : "";
html += "\" ";
//html += "ng-disabled=\"" + this.form.name + "_form.$pristine";
//html += (this.form.allowReadonly) ? " || " + this.form.name + "ReadOnly == true" : "";
//html += "\" ";
}
}
html += ">";