From bdeccc33043f7047232d69da866add638d137734 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 2 Mar 2011 17:08:55 -0800
Subject: [PATCH] bug 8636: (2.1.x UI) Router page - Advanced Search - change
 domain dropdown to autoComplete input text field.

---
 ui/jsp/tab_instances.jsp           |  4 ++
 ui/scripts/cloud.core.instances.js | 67 ++++++++++++++++++++++--------
 2 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/ui/jsp/tab_instances.jsp b/ui/jsp/tab_instances.jsp
index 6f32ba986a0..83fbcf29334 100755
--- a/ui/jsp/tab_instances.jsp
+++ b/ui/jsp/tab_instances.jsp
@@ -1283,8 +1283,12 @@ long milliseconds = new Date().getTime();
                         <li id="adv_search_domain_li" style="display: none;">
                             <label for="filter">
                                 Domain:</label>
+                            <input class="text" type="text" id="domain" />
+		                	<div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+		                    <!-- 
                             <select class="select" id="adv_search_domain">
                             </select>
+                            -->
                         </li>
                         <li id="adv_search_account_li" style="display: none;">
                             <label for="filter">
diff --git a/ui/scripts/cloud.core.instances.js b/ui/scripts/cloud.core.instances.js
index a6c0e18bb33..1cbb47e3e1b 100644
--- a/ui/scripts/cloud.core.instances.js
+++ b/ui/scripts/cloud.core.instances.js
@@ -1787,8 +1787,7 @@ function showInstancesTab(p_domainId, p_account) {
 				    moreCriteria.push("&podId="+pod);
 	        }
 		    
-		    //var domainId = submenuContent.find("#advanced_search #adv_search_domain").val();		
-		    debugger;    
+		    //var domainId = submenuContent.find("#advanced_search #adv_search_domain").val();	
 		    if (submenuContent.find("#adv_search_domain_li").css("display") != "none") {
 	            var domainName = submenuContent.find("#domain").val();
 	            if (domainName != null && domainName.length > 0) { 	
@@ -2348,25 +2347,59 @@ function showInstancesTab(p_domainId, p_account) {
         var commandString;            
 		var advanced = submenuContent.find("#search_button").data("advanced");                    
 		if (advanced != null && advanced) {		
+		    var moreCriteria = [];	
+		    
 		    var name = submenuContent.find("#advanced_search #adv_search_name").val();	
-		    var state = submenuContent.find("#advanced_search #adv_search_state").val();
-		    var zone = submenuContent.find("#advanced_search #adv_search_zone").val();
-		    var pod = submenuContent.find("#advanced_search #adv_search_pod").val();
-		    var domainId = submenuContent.find("#advanced_search #adv_search_domain").val();
-		    var account = submenuContent.find("#advanced_search #adv_search_account").val();
-		    var moreCriteria = [];								
-			if (name!=null && trim(name).length > 0) 
+		    if (name!=null && trim(name).length > 0) 
 				moreCriteria.push("&name="+encodeURIComponent(trim(name)));				
-			if (state!=null && state.length > 0) 
+		    
+		    var state = submenuContent.find("#advanced_search #adv_search_state").val();
+		    if (state!=null && state.length > 0) 
 				moreCriteria.push("&state="+state);		
+		    
+		    var zone = submenuContent.find("#advanced_search #adv_search_zone").val();
 		    if (zone!=null && zone.length > 0) 
-				moreCriteria.push("&zoneId="+zone);		
-		    if (pod!=null && pod.length > 0) 
-				moreCriteria.push("&podId="+pod);
-			if (domainId!=null && domainId.length > 0) 
-				moreCriteria.push("&domainid="+domainId);			
-			if (account!=null && account.length > 0) 
-				moreCriteria.push("&account="+account);	
+				moreCriteria.push("&zoneId="+zone);	
+			
+			if (submenuContent.find("#adv_search_pod_li").css("display") != "none") {		
+		        var pod = submenuContent.find("#advanced_search #adv_search_pod").val();
+		        if (pod!=null && pod.length > 0) 
+				    moreCriteria.push("&podId="+pod);
+			}
+			
+			/*	
+		    var domainId = submenuContent.find("#advanced_search #adv_search_domain").val();
+		    if (domainId!=null && domainId.length > 0) 
+				moreCriteria.push("&domainid="+domainId);	
+			*/
+			if (submenuContent.find("#adv_search_domain_li").css("display") != "none") {
+	            var domainName = submenuContent.find("#domain").val();
+	            if (domainName != null && domainName.length > 0) { 	
+				    var domainId;							    
+			        if(autoCompleteDomains != null && autoCompleteDomains.length > 0) {									
+				        for(var i=0; i < autoCompleteDomains.length; i++) {					        
+				          if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) {
+				              domainId = autoCompleteDomains[i].id;
+				              break;	
+				          }
+			            } 					   			    
+			        } 	     	
+	                if(domainId == null) { 
+			            showError(false, submenuContent.find("#domain"), submenuContent.find("#domain_errormsg"), g_dictionary["label.not.found"]);
+			        }
+			        else { //e.g. domainId == 5 (number)
+			            showError(true, submenuContent.find("#domain"), submenuContent.find("#domain_errormsg"), null)
+			            moreCriteria.push("&domainid="+todb(domainId));	
+			        }
+			    }
+	        }   
+			
+			if (submenuContent.find("#adv_search_account_li").css("display") != "none") {    	
+		        var account = submenuContent.find("#advanced_search #adv_search_account").val();
+			    if (account!=null && account.length > 0) 
+				    moreCriteria.push("&account="+account);	
+		    }
+				
 			commandString = "command=listRouters&page="+currentPage+moreCriteria.join("")+"&response=json";
 		} else {              
             var searchInput = submenuContent.find("#search_input").val();