From 58a1bc71fcd0599c99bd78d86f7a99e569dad8d5 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 9 Dec 2011 12:01:17 -0800 Subject: [PATCH] bug 10236: cloudStack 3.0 new UI - instance page - make migrate action available regardless of hypervisor type. --- ui/scripts/instances.js | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 427457b6233..57216f1b17e 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -1628,20 +1628,14 @@ allowedActions.push("stop"); allowedActions.push("restart"); allowedActions.push("destroy"); - if (isAdmin() - && (jsonObj.rootdevicetype == 'NetworkFilesystem' || jsonObj.rootdevicetype == 'IscsiLUN' || jsonObj.rootdevicetype == 'PreSetup' || jsonObj.rootdevicetype == 'OCFS2') - //&& (jsonObj.hypervisor == 'XenServer' || jsonObj.hypervisor == 'VMware') - ) - { - allowedActions.push("migrate"); - } + + if (isAdmin()) + allowedActions.push("migrate"); - if (jsonObj.isoid == null) { - allowedActions.push("attachISO"); - } - else { - allowedActions.push("detachISO"); - } + if (jsonObj.isoid == null) + allowedActions.push("attachISO"); + else + allowedActions.push("detachISO"); allowedActions.push("resetPassword"); allowedActions.push("changeService");