apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

cloudstack UI - advanced search - show advanced search icon on listView only when advSearch property is specified.

Browse Source
This commit is contained in:
Jessica Wang 2012-10-02 10:44:07 -07:00
parent 751d391a32
commit 6266fcb8f7
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/scripts/storage.js
View File

@ -302,9 +302,9 @@
if(args.filterBy != null) { if(args.filterBy != null) {
if(args.filterBy.advSearch != null && typeof(args.filterBy.advSearch) == "object") { if(args.filterBy.advSearch != null && typeof(args.filterBy.advSearch) == "object") {
for(var key in args.filterBy.advSearch) { for(var key in args.filterBy.advSearch) {
if(key == 'tagKey') if(key == 'tagKey' && args.filterBy.advSearch[key].length > 0)
array1.push("&tags[0].key=" + args.filterBy.advSearch[key]); array1.push("&tags[0].key=" + args.filterBy.advSearch[key]);
else if(key == 'tagValue') else if(key == 'tagValue' && args.filterBy.advSearch[key].length > 0)
array1.push("&tags[0].value=" + args.filterBy.advSearch[key]); array1.push("&tags[0].value=" + args.filterBy.advSearch[key]);
else if(args.filterBy.advSearch[key] != null && args.filterBy.advSearch[key].length > 0) else if(args.filterBy.advSearch[key] != null && args.filterBy.advSearch[key].length > 0)
array1.push("&" + key + "=" + args.filterBy.advSearch[key]); array1.push("&" + key + "=" + args.filterBy.advSearch[key]);

9
ui/scripts/ui/widgets/listView.js
View File

@ -670,12 +670,15 @@
return $filters.appendTo($toolbar); return $filters.appendTo($toolbar);
}; };
var createSearchBar = function($toolbar) { var createSearchBar = function($toolbar, listViewData) {
var $search = $('<div></div>').addClass('text-search reduced-hide'); var $search = $('<div></div>').addClass('text-search reduced-hide');
var $searchBar = $('<div></div>').addClass('search-bar reduced hide').appendTo($search); var $searchBar = $('<div></div>').addClass('search-bar reduced hide').appendTo($search);
$searchBar.append('<input type="text" />'); $searchBar.append('<input type="text" />');
$search.append('<div id="basic_search" class="button search"></div>'); $search.append('<div id="basic_search" class="button search"></div>');
//$search.append('<div id="advanced_search" class="button search"></div>'); /*
if(listViewData.advSearchFields != null)
$search.append('<div id="advanced_search" class="button search"></div>');
*/
return $search.appendTo($toolbar); return $search.appendTo($toolbar);
}; };
@ -1271,7 +1274,7 @@
listViewData.actions, listViewData.actions,
{ reorder: reorder }); { reorder: reorder });
createFilters($toolbar, listViewData.filters); createFilters($toolbar, listViewData.filters);
createSearchBar($toolbar); createSearchBar($toolbar, listViewData);
loadBody( loadBody(
$table, $table,