From 366cd3d053bcad3e393b3e91e9dc24886cdd91b4 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 27 Dec 2010 12:23:28 -0800
Subject: [PATCH] Security Group page - implement new advanced search.

---
 ui/jsp/securitygroup.jsp               |  5 +----
 ui/scripts/cloud.core.securitygroup.js | 21 ++++++++-------------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/ui/jsp/securitygroup.jsp b/ui/jsp/securitygroup.jsp
index 2ffddf96548..30b9d4ab840 100644
--- a/ui/jsp/securitygroup.jsp
+++ b/ui/jsp/securitygroup.jsp
@@ -299,10 +299,7 @@
     <div class="adv_searchpopup_bg" id="advanced_search_popup" style="display: none;">
         <div class="adv_searchformbox">
             <form action="#" method="post">
-            <ol>
-                <li>
-                    <input class="text textwatermark" type="text" id="adv_search_name" value="by name" />
-                </li>
+            <ol>                
                 <li id="adv_search_domain_li" style="display: none;">
                     <select class="select" id="adv_search_domain">
                     </select>
diff --git a/ui/scripts/cloud.core.securitygroup.js b/ui/scripts/cloud.core.securitygroup.js
index f50f373035b..bea3cae72b1 100644
--- a/ui/scripts/cloud.core.securitygroup.js
+++ b/ui/scripts/cloud.core.securitygroup.js
@@ -19,24 +19,19 @@
 function securityGroupGetSearchParams() {
     var moreCriteria = [];	
 
-	var $advancedSearchPopup = $("#advanced_search_popup");
-	if (lastSearchType == "advanced_search" && $advancedSearchPopup.length > 0) {
-	    var name = $advancedSearchPopup.find("#adv_search_name").val();							
-		if (name!=null && trim(name).length > 0) 
-			moreCriteria.push("&name="+todb(name));	
-        
+    var searchInput = $("#basic_search").find("#search_input").val();	 
+    if (searchInput != null && searchInput.length > 0) {	           
+        moreCriteria.push("&keyword="+todb(searchInput));	       
+    }     
+
+	var $advancedSearchPopup = getAdvancedSearchPopupInSearchContainer();
+	if ($advancedSearchPopup.length > 0 && $advancedSearchPopup.css("display") != "none" ) {	    
         if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none") {		
 		    var domainId = $advancedSearchPopup.find("#adv_search_domain").val();		
 		    if (domainId!=null && domainId.length > 0) 
 			    moreCriteria.push("&domainid="+domainId);	
     	}	    
-	} 
-	else {     			    		
-	    var searchInput = $("#basic_search").find("#search_input").val();	 
-        if (lastSearchType == "basic_search" && searchInput != null && searchInput.length > 0) {	           
-            moreCriteria.push("&keyword="+todb(searchInput));	       
-        }        
-	}
+	} 	
 	
 	return moreCriteria.join("");          
 }