From 8ba6821a8eae6cf48578c741f946fd084e6454bf Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 28 Feb 2011 11:35:16 -0800
Subject: [PATCH] bug 8636: advanced search in Template page, ISO page, Event
 page - change domain dropdown to autoComplete input textbox.

---
 ui/jsp/event.jsp                  |  4 ++++
 ui/jsp/iso.jsp                    |  4 ++++
 ui/jsp/template.jsp               |  4 ++++
 ui/scripts/cloud.core.event.js    | 25 +++++++++++++++++++++----
 ui/scripts/cloud.core.iso.js      | 27 ++++++++++++++++++++++-----
 ui/scripts/cloud.core.template.js | 27 ++++++++++++++++++++++-----
 6 files changed, 77 insertions(+), 14 deletions(-)

diff --git a/ui/jsp/event.jsp b/ui/jsp/event.jsp
index 2fb98f97090..c2750a9411e 100644
--- a/ui/jsp/event.jsp
+++ b/ui/jsp/event.jsp
@@ -297,8 +297,12 @@
                     </select>
                 </li>
                 <li id="adv_search_domain_li" style="display: none;">
+                    <input class="text textwatermark" type="text" id="domain" value='<fmt:message key="label.by.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;">
                     <input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />
diff --git a/ui/jsp/iso.jsp b/ui/jsp/iso.jsp
index 8f33575e22d..613cad8aab7 100644
--- a/ui/jsp/iso.jsp
+++ b/ui/jsp/iso.jsp
@@ -427,8 +427,12 @@ dictionary = {
                     </select>
                 </li>
                 <li id="adv_search_domain_li" style="display: none;">
+                    <input class="text textwatermark" type="text" id="domain" value='<fmt:message key="label.by.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;">
                     <input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />
diff --git a/ui/jsp/template.jsp b/ui/jsp/template.jsp
index 0adb1d8e2cb..e0fbaeb90b3 100644
--- a/ui/jsp/template.jsp
+++ b/ui/jsp/template.jsp
@@ -452,8 +452,12 @@ dictionary = {
                     </select>
                 </li>
                 <li id="adv_search_domain_li" style="display: none;">
+                    <input class="text textwatermark" type="text" id="domain" value='<fmt:message key="label.by.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;">
                     <input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />
diff --git a/ui/scripts/cloud.core.event.js b/ui/scripts/cloud.core.event.js
index 69acc3306e4..2f790d9a060 100644
--- a/ui/scripts/cloud.core.event.js
+++ b/ui/scripts/cloud.core.event.js
@@ -34,10 +34,27 @@ function eventGetSearchParams() {
 	    if (level!=null && level.length > 0) 
 			moreCriteria.push("&level="+todb(level));	
 		
-		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="+todb(domainId));	
+		if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none"
+	        && $advancedSearchPopup.find("#domain").hasClass("textwatermark") == false) {
+	        var domainName = $advancedSearchPopup.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, $advancedSearchPopup.find("#domain"), $advancedSearchPopup.find("#domain_errormsg"), g_dictionary["label.not.found"]);
+			    }
+			    else { //e.g. domainId == 5 (number)
+			        showError(true, $advancedSearchPopup.find("#domain"), $advancedSearchPopup.find("#domain_errormsg"), null)
+			        moreCriteria.push("&domainid="+todb(domainId));	
+			    }
+			}
 	    }
     	
     	if ($advancedSearchPopup.find("#adv_search_account_li").css("display") != "none" 
diff --git a/ui/scripts/cloud.core.iso.js b/ui/scripts/cloud.core.iso.js
index 4b4c2584c20..34e1f99fbd5 100644
--- a/ui/scripts/cloud.core.iso.js
+++ b/ui/scripts/cloud.core.iso.js
@@ -35,11 +35,28 @@ function isoGetSearchParams() {
 	    if (zone!=null && zone.length > 0) 
 			moreCriteria.push("&zoneId="+zone);	
 				
-        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);	
-    	}	
+        if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none"
+	        && $advancedSearchPopup.find("#domain").hasClass("textwatermark") == false) {
+	        var domainName = $advancedSearchPopup.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, $advancedSearchPopup.find("#domain"), $advancedSearchPopup.find("#domain_errormsg"), g_dictionary["label.not.found"]);
+			    }
+			    else { //e.g. domainId == 5 (number)
+			        showError(true, $advancedSearchPopup.find("#domain"), $advancedSearchPopup.find("#domain_errormsg"), null)
+			        moreCriteria.push("&domainid="+todb(domainId));	
+			    }
+			}
+	    }
     	
 		if ($advancedSearchPopup.find("#adv_search_account_li").css("display") != "none" 
     	    && $advancedSearchPopup.find("#adv_search_account").hasClass("textwatermark") == false) {	
diff --git a/ui/scripts/cloud.core.template.js b/ui/scripts/cloud.core.template.js
index b0d735203f4..0e784a8670f 100644
--- a/ui/scripts/cloud.core.template.js
+++ b/ui/scripts/cloud.core.template.js
@@ -35,11 +35,28 @@ function templateGetSearchParams() {
 	    if (zone!=null && zone.length > 0) 
 			moreCriteria.push("&zoneId="+zone);	
 				
-        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);	
-    	}	
+        if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none"
+	        && $advancedSearchPopup.find("#domain").hasClass("textwatermark") == false) {
+	        var domainName = $advancedSearchPopup.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, $advancedSearchPopup.find("#domain"), $advancedSearchPopup.find("#domain_errormsg"), g_dictionary["label.not.found"]);
+			    }
+			    else { //e.g. domainId == 5 (number)
+			        showError(true, $advancedSearchPopup.find("#domain"), $advancedSearchPopup.find("#domain_errormsg"), null)
+			        moreCriteria.push("&domainid="+todb(domainId));	
+			    }
+			}
+	    }
     	
 		if ($advancedSearchPopup.find("#adv_search_account_li").css("display") != "none" 
     	    && $advancedSearchPopup.find("#adv_search_account").hasClass("textwatermark") == false) {