Repository: cloudstack Updated Branches: refs/heads/4.3 ab6012f19 -> 835ff3550
CLOUDSTACK-6272: UI > Instance > actions > replace internal action name "restore" with "recover", "reset" with "reinstall". Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/835ff355 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/835ff355 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/835ff355 Branch: refs/heads/4.3 Commit: 835ff355069ac57566b6727887927960290b4557 Parents: ab6012f Author: Jessica Wang <[email protected]> Authored: Fri Mar 21 14:48:32 2014 -0700 Committer: Sebastien Goasguen <[email protected]> Committed: Wed Jun 18 13:25:35 2014 +0200 ---------------------------------------------------------------------- ui/scripts/instances.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/835ff355/ui/scripts/instances.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index d107a19..d45b6cb 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -651,9 +651,9 @@ poll: pollAsyncJobResult } }, - restore: { + recover: { label: 'label.recover.vm', - compactLabel: 'label.restore', + compactLabel: 'label.recover.vm', messages: { confirm: function(args) { return 'message.recover.vm'; @@ -685,7 +685,7 @@ } } }, - reset: { + reinstall: { label: 'label.reinstall.vm', messages: { confirm: function(args) { @@ -2186,7 +2186,7 @@ if (jsonObj.state == 'Destroyed') { if (isAdmin() || isDomainAdmin()) { - allowedActions.push("restore"); + allowedActions.push("recover"); } if (isAdmin() || isDomainAdmin()) allowedActions.push("expunge"); @@ -2196,7 +2196,7 @@ if (jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true) allowedActions.push("snapshot"); allowedActions.push("destroy"); - allowedActions.push("reset"); + allowedActions.push("reinstall"); //when userVm is running, scaleUp is not supported for KVM if (jsonObj.hypervisor != 'KVM') { @@ -2222,7 +2222,7 @@ allowedActions.push("edit"); allowedActions.push("start"); allowedActions.push("destroy"); - allowedActions.push("reset"); + allowedActions.push("reinstall"); if (jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true) allowedActions.push("snapshot"); allowedActions.push("scaleUp"); //when vm is stopped, scaleUp is supported for all hypervisors
