mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-02 20:02:29 +01:00
new UI - instance page - specify group name when calling listvirtualmachine API (when users click on instance group on left menu).
This commit is contained in:
parent
3867285af8
commit
f456632a15
@ -622,8 +622,7 @@ long milliseconds = new Date().getTime();
|
||||
<p>
|
||||
<strong id="first_row"> </strong>
|
||||
</p>
|
||||
<p id="second_row_container">
|
||||
<span id="second_row_label"> </span>
|
||||
<p id="second_row_container">
|
||||
<span id="second_row"> </span>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -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<instances.length;i++) {
|
||||
var instance = instances[i];
|
||||
var instanceGroup = instance.group;
|
||||
if(instanceGroup == null || instanceGroup == "")
|
||||
instanceGroup = noGroupName;
|
||||
if(instanceGroup != groupName)
|
||||
continue;
|
||||
for(var i=0; i<instances.length;i++) {
|
||||
var $template = $midmenuItem.clone();
|
||||
vmJsonToMidmenu(instance, $template);
|
||||
vmJsonToMidmenu(instances[i], $template);
|
||||
$("#midmenu_container").append($template.show());
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
});
|
||||
return false;
|
||||
});
|
||||
|
||||
});
|
||||
$("#leftmenu_instance_group_container").append($groupTemplate);
|
||||
}
|
||||
}
|
||||
|
||||
@ -192,7 +192,7 @@ function todb(val) {
|
||||
return encodeURIComponent(escape(val));
|
||||
}
|
||||
|
||||
|
||||
var midmenuItemCount = 20;
|
||||
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user