External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-09 10:27:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4858 from chrismeyersfsu/fix-4857

Browse Source 
allow overriding chkbox ngDisable inheritance
This commit is contained in:
Chris Meyers
2017-01-20 15:59:07 -05:00
committed by GitHub
parent e3dad92a05 a59da9115e
commit d81194f791
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/ui/client/src/forms/Credentials.js
View File

@@ -231,7 +231,8 @@ export default
subCheckbox: { subCheckbox: {
variable: 'ssh_password_ask', variable: 'ssh_password_ask',
text: i18n._('Ask at runtime?'), text: i18n._('Ask at runtime?'),
ngChange: 'ask(\'ssh_password\', \'undefined\')' ngChange: 'ask(\'ssh_password\', \'undefined\')',
ngDisabled: false,
}, },
hasShowInputButton: true, hasShowInputButton: true,
autocomplete: false, autocomplete: false,
@@ -309,7 +310,8 @@ export default
subCheckbox: { subCheckbox: {
variable: 'become_password_ask', variable: 'become_password_ask',
text: i18n._('Ask at runtime?'), text: i18n._('Ask at runtime?'),
ngChange: 'ask(\'become_password\', \'undefined\')' ngChange: 'ask(\'become_password\', \'undefined\')',
ngDisabled: false,
}, },
hasShowInputButton: true, hasShowInputButton: true,
autocomplete: false, autocomplete: false,
@@ -394,7 +396,8 @@ export default
subCheckbox: { subCheckbox: {
variable: 'vault_password_ask', variable: 'vault_password_ask',
text: i18n._('Ask at runtime?'), text: i18n._('Ask at runtime?'),
ngChange: 'ask(\'vault_password\', \'undefined\')' ngChange: 'ask(\'vault_password\', \'undefined\')',
ngDisabled: false,
}, },
hasShowInputButton: true, hasShowInputButton: true,
autocomplete: false, autocomplete: false,

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

@@ -914,10 +914,11 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
field.subCheckbox.variable + "\" "; field.subCheckbox.variable + "\" ";
html += (field.subCheckbox.ngChange) ? "ng-change=\"" + field.subCheckbox.ngChange + "\" " : ""; html += (field.subCheckbox.ngChange) ? "ng-change=\"" + field.subCheckbox.ngChange + "\" " : "";
html += "id=\"" + this.form.name + "_" + fld + "_ask_chbox\" "; html += "id=\"" + this.form.name + "_" + fld + "_ask_chbox\" ";
if (field.subCheckbox.ngDisabled) { if (field.subCheckbox.ngDisabled !== undefined) {
html += "ng-disabled='" + field.subCheckbox.ngDisabled + "'"; html += "ng-disabled='" + field.subCheckbox.ngDisabled + "'";
} else {
html += (field.ngDisabled) ? "ng-disabled=\"" + field.ngDisabled + "\" " : "";
} }
html += (field.ngDisabled) ? "ng-disabled=\"" + field.ngDisabled + "\" " : "";
html += ">"; html += ">";
html += field.subCheckbox.text ? field.subCheckbox.text : ""; html += field.subCheckbox.text ? field.subCheckbox.text : "";
html += "</label>"; html += "</label>";