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

network page - implement advanced search.

Browse Source
This commit is contained in:
Jessica Wang 2010-12-15 19:01:12 -08:00
parent 52e6e4d06e
commit 1e595ddf00
2 changed files with 39 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ui/jsp/network.jsp
View File

@ -968,4 +968,33 @@
(info)</div>
</div>
</div>
<!-- Add network dialog for zone (end) -->
<!-- Add network dialog for zone (end) -->
<!-- advanced search template (begin) -->
<div id="advanced_search_template" class="adv_searchpopup" style="display: none;">
<div class="adv_searchformbox">
<h3>
Advance Search</h3>
<a id="advanced_search_close" href="#">Close </a>
<form action="#" method="post">
<ol>
<li id="adv_search_domain_li" style="display: none;">
<label for="filter">
Domain:</label>
<select class="select" id="adv_search_domain">
</select>
</li>
<li id="adv_search_account_li" style="display: none;">
<label for="filter">
Account:</label>
<input class="text" type="text" id="adv_search_account" />
</li>
</ol>
</form>
<div class="adv_search_actionbox">
<div class="adv_searchpopup_button" id="adv_search_button">
</div>
</div>
</div>
</div>
<!-- advanced search template (end) -->

52
ui/scripts/cloud.core.network.js
View File

@ -20,34 +20,18 @@ function networkGetSearchParams() {
var moreCriteria = [];
var $advancedSearchPopup = $("#advanced_search_popup");
if (lastSearchType == "advanced_search" && $advancedSearchPopup.length > 0) {
var type = $advancedSearchPopup.find("#adv_search_type").val();
if (type!=null && trim(type).length > 0)
moreCriteria.push("&type="+todb(type));
var level = $advancedSearchPopup.find("#adv_search_level").val();
if (level!=null && level.length > 0)
moreCriteria.push("&level="+todb(level));
if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none") {
if (lastSearchType == "advanced_search" && $advancedSearchPopup.length > 0) {
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));
}
moreCriteria.push("&domainid="+domainId);
}
if ($advancedSearchPopup.find("#adv_search_account_li").css("display") != "none") {
var account = $advancedSearchPopup.find("#adv_search_account").val();
if ($advancedSearchPopup.find("#adv_search_account_li").css("display") != "none") {
var account = $advancedSearchPopup.find("#adv_search_account").val();
if (account!=null && account.length > 0)
moreCriteria.push("&account="+todb(account));
}
var startdate = $advancedSearchPopup.find("#adv_search_startdate").val();
if (startdate!=null && startdate.length > 0)
moreCriteria.push("&startdate="+todb(startdate));
var enddate = $advancedSearchPopup.find("#adv_search_enddate").val();
if (enddate!=null && enddate.length > 0)
moreCriteria.push("&enddate="+todb(enddate));
moreCriteria.push("&account="+account);
}
}
else {
var searchInput = $("#basic_search").find("#search_input").val();
@ -88,25 +72,7 @@ function afterLoadNetworkJSP($leftmenuItem1) {
//direct network
listMidMenuItems2(("listNetworks&type=Direct&zoneId="+zoneObj.id), networkGetSearchParams, "listnetworksresponse", "network", directNetworkToMidmenu, directNetworkToRightPanel, directNetworkGetMidmenuId, false, 1);
/*
$.ajax({
data: createURL("command=listNetworks&type=Direct&zoneId="+zoneObj.id),
dataType: "json",
success: function(json) {
var items = json.listnetworksresponse.network;
if (items != null && items.length > 0) {
for (var i = 0; i < items.length; i++) {
var $midmenuItem1 = $("#midmenu_item").clone();
$midmenuItem1.data("toRightPanelFn", directNetworkToRightPanel);
directNetworkToMidmenu(items[i], $midmenuItem1);
bindClickToMidMenu($midmenuItem1, directNetworkToRightPanel, directNetworkGetMidmenuId);
$midmenuContainer.append($midmenuItem1.show());
}
}
}
});
*/
//public network
if(zoneObj.networktype == "Advanced") {
$.ajax({