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

cloudStack - snapshot page - populate volume name first, then snapshot state.

This commit is contained in:
Jessica Wang 2011-07-20 11:42:10 -07:00
parent af24052361
commit 0800b6423b
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ui/scripts/cloud.core.instance.js
View File

@ -149,8 +149,7 @@ function afterLoadInstanceJSP() {
if(isAdmin()) {
$dialogStopVm.find("#force_stop_instance_container").show();
}
$.ajax({
data: createURL("command=listOsTypes"),
dataType: "json",
@ -228,7 +227,7 @@ function bindStopVMButton() {
$("#dialog_info_please_select_one_item_in_middle_menu").dialog("open");
return false;
}
$("#dialog_confirmation_stop_vm")
.dialog('option', 'buttons', {
"Confirm": function() {
@ -246,13 +245,13 @@ function bindStopVMButton() {
vmToRightPanel($midmenuItem1);
}
}
var isForced = $("#dialog_confirmation_stop_vm").find("#force_stop_instance").attr("checked").toString();
for(var id in selectedItemsInMidMenu) {
var apiCommand = "command=stopVirtualMachine&id="+id+"&forced="+isForced;
doActionToMidMenu(id, apiInfo, apiCommand);
}
for(var id in selectedItemsInMidMenu) {
var apiCommand = "command=stopVirtualMachine&id="+id+"&forced="+isForced;
doActionToMidMenu(id, apiInfo, apiCommand);
}
selectedItemsInMidMenu = {}; //clear selected items for action
},
@ -1420,15 +1419,15 @@ function doStartVM($actionLink, $detailsTab, $midmenuItem1) {
}
function doStopVM($actionLink, $detailsTab, $midmenuItem1) {
$("#dialog_confirmation_stop_vm")
$("#dialog_confirmation_stop_vm")
.dialog('option', 'buttons', {
"Confirm": function() {
$(this).dialog("close");
var jsonObj = $midmenuItem1.data("jsonObj");
var id = jsonObj.id;
var isForced = $("#dialog_confirmation_stop_vm").find("#force_stop_instance").attr("checked").toString();
var apiCommand = "command=stopVirtualMachine&id="+id+"&forced="+isForced;
var id = jsonObj.id;
var isForced = $("#dialog_confirmation_stop_vm").find("#force_stop_instance").attr("checked").toString();
var apiCommand = "command=stopVirtualMachine&id="+id+"&forced="+isForced;
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {

6
ui/scripts/cloud.core.snapshot.js
View File

@ -168,9 +168,9 @@ function snapshotJsonToDetailsTab() {
});
$thisTab.find("#id").text(fromdb(jsonObj.id));
$thisTab.find("#name").text(fromdb(jsonObj.name));
$thisTab.find("#state").text(fromdb(jsonObj.state));
$thisTab.find("#volume_name").text(fromdb(jsonObj.volumename));
$thisTab.find("#name").text(fromdb(jsonObj.name));
$thisTab.find("#volume_name").text(fromdb(jsonObj.volumename));
$thisTab.find("#state").text(fromdb(jsonObj.state));
$thisTab.find("#interval_type").text(fromdb(jsonObj.intervaltype));
$thisTab.find("#account").text(fromdb(jsonObj.account));
$thisTab.find("#domain").text(fromdb(jsonObj.domain));