From 45ae67d7b548ff13a421b21633f413065a8509db Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Fri, 3 Oct 2014 20:05:15 -0400 Subject: [PATCH] adding changes to form generator for ngDisabled for buttons --- awx/ui/static/lib/ansible/form-generator.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/awx/ui/static/lib/ansible/form-generator.js b/awx/ui/static/lib/ansible/form-generator.js index 07e6a722a4..9364c27347 100644 --- a/awx/ui/static/lib/ansible/form-generator.js +++ b/awx/ui/static/lib/ansible/form-generator.js @@ -1253,7 +1253,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator // string to be injected into the current view. // var btn, button, fld, field, html = '', i, section, group, - tab, sectionShow, offset, width; + tab, sectionShow, offset, width,ngDisabled; if (!this.modal && (options.breadCrumbs === undefined || options.breadCrumbs === true)) { if (this.form.navigationLinks) { @@ -1446,9 +1446,10 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator html += this.attr(button, 'ngClick'); } if (button.ngDisabled) { + ngDisabled = (button.ngDisabled===true) ? this.form.name+"_form.$invalid" : button.ngDisabled; if (btn !== 'reset') { //html += "ng-disabled=\"" + this.form.name + "_form.$pristine || " + this.form.name + "_form.$invalid"; - html += "ng-disabled=\"" + this.form.name + "_form.$invalid"; + html += "ng-disabled=\"" + ngDisabled; //html += (this.form.allowReadonly) ? " || " + this.form.name + "ReadOnly == true" : ""; html += "\" "; } else {