From 3a3ed76ae44293ee804c790884bc77d4e7583ea1 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 28 Nov 2013 10:47:37 +0100 Subject: [PATCH] [UI] kvm vm snapshot not shown if kvm.snapshot.enabled is set to false (cherry picked from commit 64c03dbc3129fe7b2c613f2981b3f645d88b449b) --- ui/scripts/instances.js | 6 ++++-- ui/scripts/storage.js | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 025084b6166..ed2d7e55e88 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -2092,7 +2092,8 @@ } else if (jsonObj.state == 'Running') { allowedActions.push("stop"); allowedActions.push("restart"); - allowedActions.push("snapshot"); + if (jsonObj.hypervisor != 'KVM' || g_KVMsnapshotenabled == true) + allowedActions.push("snapshot"); allowedActions.push("destroy"); allowedActions.push("reset"); @@ -2121,7 +2122,8 @@ allowedActions.push("start"); allowedActions.push("destroy"); allowedActions.push("reset"); - allowedActions.push("snapshot"); + 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"); diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index ba7891728d2..ea87d5d3851 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -1866,7 +1866,7 @@ if (jsonObj.hypervisor != "Ovm" && jsonObj.state == "Ready") { if (jsonObj.hypervisor == 'KVM') { - if (json.vmstate == 'Running') { + 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) allowedActions.push("takeSnapshot"); allowedActions.push("recurringSnapshot");