diff --git a/ui/new/index.jsp b/ui/new/index.jsp index 0591dd46dda..425edbeaab9 100644 --- a/ui/new/index.jsp +++ b/ui/new/index.jsp @@ -622,8 +622,7 @@ long milliseconds = new Date().getTime();

 

-

-   +

 

diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js index ef134d0376d..38bce04dbb1 100644 --- a/ui/new/scripts/cloud.core2.init.js +++ b/ui/new/scripts/cloud.core2.init.js @@ -60,11 +60,10 @@ $(document).ready(function() { var $midmenuItem = $("#midmenu_item"); function listMidMenuItems(leftmenuId, apiName, jsonResponse1, jsonResponse2, rightPanelJSP, toMidmenu, toRightPanel) { $("#"+leftmenuId).bind("click", function(event) { - $("#right_panel").load(rightPanelJSP); - + $("#right_panel").load(rightPanelJSP); $.ajax({ cache: false, - data: createURL("command="+apiName+"&response=json"), + data: createURL("command="+apiName+"&pagesize="+midmenuItemCount), dataType: "json", success: function(json) { $("#midmenu_container").empty(); diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js index e47012af1e6..91c1aa74e7b 100644 --- a/ui/new/scripts/cloud.core2.instance.js +++ b/ui/new/scripts/cloud.core2.instance.js @@ -480,31 +480,26 @@ function clickInstanceGroupHeader($arrowIcon) { $("#midmenu_container").empty(); selectedItemsInMidMenu = {}; - var groupName = $(this).find("#group_name").text(); + var groupName = $(this).find("#group_name").text(); + var group1 = groupName; + if(groupName == noGroupName) + group1 = ""; $.ajax({ cache: false, - data: createURL("command=listVirtualMachines"), + data: createURL("command=listVirtualMachines&group="+group1+"&pagesize="+midmenuItemCount), dataType: "json", success: function(json) { var instances = json.listvirtualmachinesresponse.virtualmachine; - for(var i=0; i