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

AC-1325 plus inventory refactor cleanup

Browse Source 
Fixed obvious issues found after pulling in inventory refactor changes from 1.4.11 branch. Included fixing modal dialog issues.
This commit is contained in:
Chris Houseknecht
2014-06-03 19:02:56 -04:00
parent 0cfef78663
commit ad5d0454c2
7 changed files with 27 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1136,7 +1136,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator
}
}
if (!this.modal && this.form.actions) {
if ((options.showActions === undefined || options.showActions === true) && !this.modal && this.form.actions) {
html += this.getActions(options);
}
@@ -1251,7 +1251,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator
}
//buttons
if (!this.modal) {
if ((options.showButtons === undefined || options.showButtons === true) && !this.modal) {
if (this.has('buttons')) {
if (this.form.twoColumns) {