From 6266fcb8f716867988d30f9970f9c6f12a9f4ddc Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica.wang@citrix.com>
Date: Tue, 2 Oct 2012 10:44:07 -0700
Subject: [PATCH] cloudstack UI - advanced search - show advanced search icon
 on listView only when advSearch property is specified.

---
 ui/scripts/storage.js             | 4 ++--
 ui/scripts/ui/widgets/listView.js | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index 970eadc8829..c16e6213c4e 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -302,9 +302,9 @@
             if(args.filterBy != null) {					
 						  if(args.filterBy.advSearch != null && typeof(args.filterBy.advSearch) == "object") {
 							  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]);
-									else if(key == 'tagValue')
+									else if(key == 'tagValue' && args.filterBy.advSearch[key].length > 0)
 									  array1.push("&tags[0].value=" + args.filterBy.advSearch[key]);			
 								  else if(args.filterBy.advSearch[key] != null && args.filterBy.advSearch[key].length > 0)
 								    array1.push("&" + key + "=" + args.filterBy.advSearch[key]);
diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js
index 425efceb19f..ed810029579 100644
--- a/ui/scripts/ui/widgets/listView.js
+++ b/ui/scripts/ui/widgets/listView.js
@@ -670,12 +670,15 @@
     return $filters.appendTo($toolbar);
   };
 
-  var createSearchBar = function($toolbar) {
+  var createSearchBar = function($toolbar, listViewData) {
     var $search = $('<div></div>').addClass('text-search reduced-hide');
     var $searchBar = $('<div></div>').addClass('search-bar reduced hide').appendTo($search);
     $searchBar.append('<input type="text" />');
     $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);
   };
 
@@ -1271,7 +1274,7 @@
                  listViewData.actions,
                  { reorder: reorder });
     createFilters($toolbar, listViewData.filters);
-    createSearchBar($toolbar);
+    createSearchBar($toolbar, listViewData);
 
     loadBody(
       $table,