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

Merge pull request #723 from mabashian/hide-search-bar-no-rows

Browse Source 
Hide form generator search bar when list is empty to start with
This commit is contained in:
Michael Abashian
2016-01-27 13:33:47 -05:00
parent dfb02aea4f 64f4cb03e7
commit b414708aba
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1658,7 +1658,8 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += SearchWidget({ html += SearchWidget({
iterator: collection.iterator, iterator: collection.iterator,
template: collection, template: collection,
mini: true mini: true,
ngShow: collection.iterator + "Loading == true || " + collection.iterator + "_active_search == true || (" + collection.iterator + "Loading == false && " + collection.iterator + "_active_search == false && " + collection.iterator + "_total_rows > 0)"
}); });
html += "<div class=\"col-lg-8\">\n"; html += "<div class=\"col-lg-8\">\n";

9
awx/ui/client/src/shared/generator-helpers.js
View File

@@ -632,6 +632,7 @@ angular.module('GeneratorHelpers', [systemStatus.name])
form = params.template, form = params.template,
size = params.size, size = params.size,
includeSize = (params.includeSize === undefined) ? true : params.includeSize, includeSize = (params.includeSize === undefined) ? true : params.includeSize,
ngShow = (params.ngShow) ? params.ngShow : false,
i, html = '', i, html = '',
modifier, modifier,
searchWidgets = (params.searchWidgets) ? params.searchWidgets : 1, searchWidgets = (params.searchWidgets) ? params.searchWidgets : 1,
@@ -667,6 +668,10 @@ angular.module('GeneratorHelpers', [systemStatus.name])
html += "\" id=\"search-widget-container" + modifier + "\">\n"; html += "\" id=\"search-widget-container" + modifier + "\">\n";
} }
if(ngShow) {
html += "<div ng-show=\"" + ngShow + "\">";
}
html += "<input id=\"search_value_input\" type=\"text\" ng-hide=\"" + iterator + "SelectShow" + modifier + " || " + html += "<input id=\"search_value_input\" type=\"text\" ng-hide=\"" + iterator + "SelectShow" + modifier + " || " +
iterator + "InputHide" + modifier + "\" " + iterator + "InputHide" + modifier + "\" " +
"class=\"form-control List-searchInput\" ng-model=\"" + iterator + "SearchValue" + modifier + "\" " + "class=\"form-control List-searchInput\" ng-model=\"" + iterator + "SearchValue" + modifier + "\" " +
@@ -688,6 +693,10 @@ angular.module('GeneratorHelpers', [systemStatus.name])
html += "<div id=\"search-widget-spacer\" ng-show=\"" + iterator + "SelectShow" + modifier + "\"></div>\n"; html += "<div id=\"search-widget-spacer\" ng-show=\"" + iterator + "SelectShow" + modifier + "\"></div>\n";
if(ngShow) {
html += "</div>";
}
if (includeSize) { if (includeSize) {
html += "</div>\n"; html += "</div>\n";
} }