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

CLOUDSTACK-4102: UI > Intances menu > when user VM is running, hide scaleUp action if hypervisor is KVM.

This commit is contained in:
Jessica Wang 2013-08-08 10:25:09 -07:00
parent 5f2f5181e9
commit 9807f86619
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/scripts/instances.js
View File

@ -1861,7 +1861,11 @@
allowedActions.push("snapshot");
allowedActions.push("destroy");
allowedActions.push("reset");
allowedActions.push("scaleUp");
//when userVm is running, scaleUp is not supported for KVM
if (jsonObj.hypervisor != 'KVM') {
allowedActions.push("scaleUp");
}
if (isAdmin())
allowedActions.push("migrate");
@ -1884,7 +1888,7 @@
allowedActions.push("destroy");
allowedActions.push("reset");
allowedActions.push("snapshot");
allowedActions.push("scaleUp");
allowedActions.push("scaleUp"); //when vm is stopped, scaleUp is supported for all hypervisors
allowedActions.push("changeAffinity");
if (isAdmin())

23
ui/scripts/system.js
View File

@ -16101,8 +16101,16 @@
if (jsonObj.state == 'Running') {
allowedActions.push("stop");
//when systemVm is running, scaleUp is not supported for KVM and XenServer.
//however, listRouters API doesn't return hypervisor property....
/*
if (jsonObj.hypervisor != 'KVM' && jsonObj.hypervisor != 'XenServer') {
allowedActions.push("scaleUp");
}
*/
allowedActions.push("scaleUp");
// if(jsonObj.vpcid != null)
allowedActions.push("restart");
allowedActions.push("viewConsole");
@ -16110,7 +16118,7 @@
allowedActions.push("migrate");
} else if (jsonObj.state == 'Stopped') {
allowedActions.push("start");
allowedActions.push("scaleUp");
allowedActions.push("scaleUp"); //when vm is stopped, scaleUp is supported for all hypervisors
allowedActions.push("remove");
}
return allowedActions;
@ -16140,13 +16148,22 @@
allowedActions.push("stop");
allowedActions.push("restart");
allowedActions.push("remove");
//when systemVm is running, scaleUp is not supported for KVM and XenServer.
//however, listSystemVms API doesn't return hypervisor property....
/*
if (jsonObj.hypervisor != 'KVM' && jsonObj.hypervisor != 'XenServer') {
allowedActions.push("scaleUp");
}
*/
allowedActions.push("scaleUp");
allowedActions.push("viewConsole");
if (isAdmin())
allowedActions.push("migrate");
} else if (jsonObj.state == 'Stopped') {
allowedActions.push("start");
allowedActions.push("scaleUp");
allowedActions.push("scaleUp"); //when vm is stopped, scaleUp is supported for all hypervisors
allowedActions.push("remove");
} else if (jsonObj.state == 'Error') {
allowedActions.push("remove");