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

Volume page - advanced search dialog - include keyword from basic search when doing search.

This commit is contained in:
Jessica Wang 2010-12-17 16:26:33 -08:00
parent a8a6419bf4
commit 2dd9eb84ee
2 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/jsp/volume.jsp
View File

@ -738,13 +738,7 @@
Zone:</label>
<select class="select" id="adv_search_zone">
</select>
</li>
<li id="adv_search_pod_li" style="display: none;">
<label for="filter" id="adv_search_pod_label">
Pod:</label>
<select class="select" id="adv_search_pod">
</select>
</li>
</li>
<li id="adv_search_domain_li" style="display: none;">
<label for="filter">
Domain:</label>

21
ui/scripts/cloud.core.volume.js
View File

@ -19,6 +19,11 @@
function volumeGetSearchParams() {
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 name = $advancedSearchPopup.find("#adv_search_name").val();
@ -28,13 +33,7 @@ function volumeGetSearchParams() {
var zone = $advancedSearchPopup.find("#adv_search_zone").val();
if (zone!=null && zone.length > 0)
moreCriteria.push("&zoneId="+zone);
if ($advancedSearchPopup.find("#adv_search_pod_li").css("display") != "none") {
var pod = $advancedSearchPopup.find("#adv_search_pod").val();
if (pod!=null && pod.length > 0)
moreCriteria.push("&podId="+pod);
}
if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none") {
var domainId = $advancedSearchPopup.find("#adv_search_domain").val();
if (domainId!=null && domainId.length > 0)
@ -47,13 +46,7 @@ function volumeGetSearchParams() {
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("");
}