etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 8636: (2.1.x UI) Router page - Advanced Search - change domain dropdown to autoComplete input text field.

This commit is contained in:
Jessica Wang 2011-03-02 17:08:55 -08:00
parent 7db6306fff
commit bdeccc3304
2 changed files with 54 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/jsp/tab_instances.jsp
View File

@ -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">

67
ui/scripts/cloud.core.instances.js
View File

@ -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();