apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-14 09:32:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-6272: UI > Instance > actions > replace internal action name "restore" with "recover", "reset" with "reinstall".

Browse Source
This commit is contained in:
Jessica Wang 2014-03-21 14:48:32 -07:00
parent 15729f342c
commit 7b817a2ad9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/scripts/instances.js
View File

@ -660,9 +660,9 @@
poll: pollAsyncJobResult poll: pollAsyncJobResult
} }
}, },
restore: { recover: {
label: 'label.recover.vm', label: 'label.recover.vm',
compactLabel: 'label.restore', compactLabel: 'label.recover.vm',
messages: { messages: {
confirm: function(args) { confirm: function(args) {
return 'message.recover.vm'; return 'message.recover.vm';
@ -694,7 +694,7 @@
} }
} }
}, },
reset: { reinstall: {
label: 'label.reinstall.vm', label: 'label.reinstall.vm',
messages: { messages: {
confirm: function(args) { confirm: function(args) {
@ -2197,7 +2197,7 @@
if (jsonObj.state == 'Destroyed') { if (jsonObj.state == 'Destroyed') {
if (isAdmin() || isDomainAdmin()) { if (isAdmin() || isDomainAdmin()) {
allowedActions.push("restore"); allowedActions.push("recover");
} }
if (isAdmin() || isDomainAdmin()) if (isAdmin() || isDomainAdmin())
allowedActions.push("expunge"); allowedActions.push("expunge");
@ -2207,7 +2207,7 @@
if (jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true) if (jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true)
allowedActions.push("snapshot"); allowedActions.push("snapshot");
allowedActions.push("destroy"); allowedActions.push("destroy");
allowedActions.push("reset"); allowedActions.push("reinstall");
//when userVm is running, scaleUp is not supported for KVM //when userVm is running, scaleUp is not supported for KVM
if (jsonObj.hypervisor != 'KVM') { if (jsonObj.hypervisor != 'KVM') {
@ -2233,7 +2233,7 @@
allowedActions.push("edit"); allowedActions.push("edit");
allowedActions.push("start"); allowedActions.push("start");
allowedActions.push("destroy"); allowedActions.push("destroy");
allowedActions.push("reset"); allowedActions.push("reinstall");
if (jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true) if (jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true)
allowedActions.push("snapshot"); allowedActions.push("snapshot");
allowedActions.push("scaleUp"); //when vm is stopped, scaleUp is supported for all hypervisors allowedActions.push("scaleUp"); //when vm is stopped, scaleUp is supported for all hypervisors