Repository: cloudstack Updated Branches: refs/heads/4.4 0d160e819 -> 056548c72
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/056548c7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/056548c7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/056548c7 Branch: refs/heads/4.4 Commit: 056548c72ea7ad15c10e087893492320b9449ac7 Parents: 0d160e8 Author: Jessica Wang <[email protected]> Authored: Fri Mar 21 14:48:32 2014 -0700 Committer: Jessica Wang <[email protected]> Committed: Fri Mar 21 14:48:32 2014 -0700 ---------------------------------------------------------------------- ui/scripts/instances.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/056548c7/ui/scripts/instances.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 0242e35..cc69b00 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -660,9 +660,9 @@ poll: pollAsyncJobResult } }, - restore: { + recover: { label: 'label.recover.vm', - compactLabel: 'label.restore', + compactLabel: 'label.recover.vm', messages: { confirm: function(args) { return 'message.recover.vm'; @@ -694,7 +694,7 @@ } } }, - reset: { + reinstall: { label: 'label.reinstall.vm', messages: { confirm: function(args) { @@ -2197,7 +2197,7 @@ if (jsonObj.state == 'Destroyed') { if (isAdmin() || isDomainAdmin()) { - allowedActions.push("restore"); + allowedActions.push("recover"); } if (isAdmin() || isDomainAdmin()) allowedActions.push("expunge"); @@ -2207,7 +2207,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') { @@ -2233,7 +2233,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
