From 3094df97e71699b4fd9a9c66a3f4501ad51e62aa Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 17 Dec 2010 15:51:35 -0800
Subject: [PATCH] Event page - advanced search dialog - include keyword from
 basic search when doing search.

---
 ui/scripts/cloud.core.event.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/ui/scripts/cloud.core.event.js b/ui/scripts/cloud.core.event.js
index 017febf2060..914778ab7e6 100644
--- a/ui/scripts/cloud.core.event.js
+++ b/ui/scripts/cloud.core.event.js
@@ -19,6 +19,11 @@
 function eventGetSearchParams() {
     var moreCriteria = [];	
 
+    var searchInput = $("#basic_search").find("#search_input").val();	 
+    if (searchInput != null && searchInput.length > 0) {	           
+        moreCriteria.push("&keyword="+todb(searchInput));	       
+    }     
+
 	var $advancedSearchPopup = $("#advanced_search_popup");
 	if (lastSearchType == "advanced_search" && $advancedSearchPopup.length > 0) {		    
 	    var type = $advancedSearchPopup.find("#adv_search_type").val();							
@@ -49,13 +54,7 @@ function eventGetSearchParams() {
 		if (enddate!=null && enddate.length > 0) 
 			moreCriteria.push("&enddate="+todb(enddate));	
 	} 
-	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("");          
 }