diff --git a/ui/jsp/network.jsp b/ui/jsp/network.jsp index 934655762c4..989e9c56109 100644 --- a/ui/jsp/network.jsp +++ b/ui/jsp/network.jsp @@ -968,4 +968,33 @@ (info) - \ No newline at end of file + + + +
+ \ No newline at end of file diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js index 9100d789a64..96a8ca673d9 100644 --- a/ui/scripts/cloud.core.network.js +++ b/ui/scripts/cloud.core.network.js @@ -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({