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

Security Group page - implement new advanced search.

This commit is contained in:
Jessica Wang 2010-12-27 12:23:28 -08:00
parent bb74da01aa
commit 366cd3d053
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/jsp/securitygroup.jsp
View File

@ -299,10 +299,7 @@
<div class="adv_searchpopup_bg" id="advanced_search_popup" style="display: none;">
<div class="adv_searchformbox">
<form action="#" method="post">
<ol>
<li>
<input class="text textwatermark" type="text" id="adv_search_name" value="by name" />
</li>
<ol>
<li id="adv_search_domain_li" style="display: none;">
<select class="select" id="adv_search_domain">
</select>

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

@ -19,24 +19,19 @@
function securityGroupGetSearchParams() {
var moreCriteria = [];
var $advancedSearchPopup = $("#advanced_search_popup");
if (lastSearchType == "advanced_search" && $advancedSearchPopup.length > 0) {
var name = $advancedSearchPopup.find("#adv_search_name").val();
if (name!=null && trim(name).length > 0)
moreCriteria.push("&name="+todb(name));
var searchInput = $("#basic_search").find("#search_input").val();
if (searchInput != null && searchInput.length > 0) {
moreCriteria.push("&keyword="+todb(searchInput));
}
var $advancedSearchPopup = getAdvancedSearchPopupInSearchContainer();
if ($advancedSearchPopup.length > 0 && $advancedSearchPopup.css("display") != "none" ) {
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);
}
}
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("");
}