Updated Branches: refs/heads/4.3 ebbc9292f -> 409cbd4c7
CLOUDSTACK-4428: KVMsnapshoteanbled property in listCapabilities API response has been renamed. Here is corresponding UI change. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/409cbd4c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/409cbd4c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/409cbd4c Branch: refs/heads/4.3 Commit: 409cbd4c7abff2a982fdced36f21e7ca5d5f5629 Parents: ebbc929 Author: Jessica Wang <[email protected]> Authored: Mon Dec 9 14:46:01 2013 -0800 Committer: Jessica Wang <[email protected]> Committed: Mon Dec 9 15:21:04 2013 -0800 ---------------------------------------------------------------------- ui/scripts/cloudStack.js | 10 +++++----- ui/scripts/instances.js | 4 ++-- ui/scripts/sharedFunctions.js | 2 +- ui/scripts/storage.js | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/409cbd4c/ui/scripts/cloudStack.js ---------------------------------------------------------------------- diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js index 7846ae8..5195a7b 100644 --- a/ui/scripts/cloudStack.js +++ b/ui/scripts/cloudStack.js @@ -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; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/409cbd4c/ui/scripts/instances.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 0074335..2b26529 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -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"); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/409cbd4c/ui/scripts/sharedFunctions.js ---------------------------------------------------------------------- diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js index a4e4861..2425c5b 100644 --- a/ui/scripts/sharedFunctions.js +++ b/ui/scripts/sharedFunctions.js @@ -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; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/409cbd4c/ui/scripts/storage.js ---------------------------------------------------------------------- diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index e58f5fd..de929b3 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -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"); }
