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

CLOUDSTACK-4428: KVMsnapshoteanbled property in listCapabilities API response has been renamed. Here is corresponding UI change.

Browse Source
This commit is contained in:
Jessica Wang 2013-12-09 14:46:01 -08:00
parent 267ff79bfb
commit 1db19c3d52
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/scripts/cloudStack.js
View File

@ -168,8 +168,8 @@
expires: 1
});
g_KVMsnapshotenabled = json.listcapabilitiesresponse.capability.KVMsnapshotenabled; //boolean
$.cookie('KVMsnapshotenabled', g_KVMsnapshotenabled, {
g_kvmsnapshotenabled = json.listcapabilitiesresponse.capability.kvmsnapshotenabled; //boolean
$.cookie('kvmsnapshotenabled', g_kvmsnapshotenabled, {
expires: 1
});
@ -309,8 +309,8 @@
expires: 1
});
g_KVMsnapshotenabled = json.listcapabilitiesresponse.capability.KVMsnapshotenabled; //boolean
$.cookie('KVMsnapshotenabled', g_KVMsnapshotenabled, {
g_kvmsnapshotenabled = json.listcapabilitiesresponse.capability.kvmsnapshotenabled; //boolean
$.cookie('kvmsnapshotenabled', g_kvmsnapshotenabled, {
expires: 1
});
@ -386,7 +386,7 @@
g_timezoneoffset = null;
g_timezone = null;
g_supportELB = null;
g_KVMsnapshotenabled = null;
g_kvmsnapshotenabled = null;
g_regionsecondaryenabled = null;
g_loginCmdText = null;

4
ui/scripts/instances.js
View File

@ -2184,7 +2184,7 @@
} else if (jsonObj.state == 'Running') {
allowedActions.push("stop");
allowedActions.push("restart");
if (jsonObj.hypervisor != 'KVM' || g_KVMsnapshotenabled == true)
if (jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true)
allowedActions.push("snapshot");
allowedActions.push("destroy");
allowedActions.push("reset");
@ -2214,7 +2214,7 @@
allowedActions.push("start");
allowedActions.push("destroy");
allowedActions.push("reset");
if (jsonObj.hypervisor != 'KVM' || g_KVMsnapshotenabled == true)
if (jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true)
allowedActions.push("snapshot");
allowedActions.push("scaleUp"); //when vm is stopped, scaleUp is supported for all hypervisors
allowedActions.push("changeAffinity");

2
ui/scripts/sharedFunctions.js
View File

@ -25,7 +25,7 @@ var g_enableLogging = false;
var g_timezoneoffset = null;
var g_timezone = null;
var g_supportELB = null;
var g_KVMsnapshotenabled = null;
var g_kvmsnapshotenabled = null;
var g_regionsecondaryenabled = null;
var g_userPublicTemplateEnabled = "true";
var g_cloudstackversion = null;

2
ui/scripts/storage.js
View File

@ -1920,7 +1920,7 @@
if (jsonObj.hypervisor != "Ovm" && jsonObj.state == "Ready") {
if (jsonObj.hypervisor == 'KVM') {
if (jsonObj.vmstate == 'Running') {
if (g_KVMsnapshotenabled == true) { //"kvm.snapshot.enabled" flag should be taken to account only when snapshot is being created for Running vm (CLOUDSTACK-4428)
if (g_kvmsnapshotenabled == true) { //"kvm.snapshot.enabled" flag should be taken to account only when snapshot is being created for Running vm (CLOUDSTACK-4428)
allowedActions.push("takeSnapshot");
allowedActions.push("recurringSnapshot");
}