apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Template page - implement new advanced search.

Browse Source
This commit is contained in:
Jessica Wang 2010-12-27 12:25:59 -08:00
parent 366cd3d053
commit b2007715bd
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/jsp/template.jsp
View File

@ -414,10 +414,6 @@
<div class="adv_searchformbox"> <div class="adv_searchformbox">
<form action="#" method="post"> <form action="#" method="post">
<ol> <ol>
<li>
<input class="text textwatermark" type="text" name="adv_search_name" id="adv_search_name"
value="by name" />
</li>
<li> <li>
<select class="select" id="adv_search_zone"> <select class="select" id="adv_search_zone">
</select> </select>

20
ui/scripts/cloud.core.template.js
View File

@ -24,12 +24,13 @@ var g_zoneNames = [];
function templateGetSearchParams() { function templateGetSearchParams() {
var moreCriteria = []; var moreCriteria = [];
var $advancedSearchPopup = $("#advanced_search_popup"); var searchInput = $("#basic_search").find("#search_input").val();
if (lastSearchType == "advanced_search" && $advancedSearchPopup.length > 0) { if (searchInput != null && searchInput.length > 0) {
var name = $advancedSearchPopup.find("#adv_search_name").val(); moreCriteria.push("&keyword="+todb(searchInput));
if (name!=null && trim(name).length > 0) }
moreCriteria.push("&name="+todb(name));
var $advancedSearchPopup = getAdvancedSearchPopupInSearchContainer();
if ($advancedSearchPopup.length > 0 && $advancedSearchPopup.css("display") != "none" ) {
var zone = $advancedSearchPopup.find("#adv_search_zone").val(); var zone = $advancedSearchPopup.find("#adv_search_zone").val();
if (zone!=null && zone.length > 0) if (zone!=null && zone.length > 0)
moreCriteria.push("&zoneId="+zone); moreCriteria.push("&zoneId="+zone);
@ -40,18 +41,13 @@ function templateGetSearchParams() {
moreCriteria.push("&domainid="+domainId); moreCriteria.push("&domainid="+domainId);
} }
if ($advancedSearchPopup.find("#adv_search_account_li").css("display") != "none") { if ($advancedSearchPopup.find("#adv_search_account_li").css("display") != "none"
&& $advancedSearchPopup.find("#adv_search_account").hasClass("textwatermark") == false) {
var account = $advancedSearchPopup.find("#adv_search_account").val(); var account = $advancedSearchPopup.find("#adv_search_account").val();
if (account!=null && account.length > 0) if (account!=null && account.length > 0)
moreCriteria.push("&account="+account); moreCriteria.push("&account="+account);
} }
} }
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(""); return moreCriteria.join("");
} }