You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2013/08/23 00:38:45 UTC
[7/8] git commit: updated refs/heads/4.2 to 99564b3
CLOUDSTACK-4102: UI > instances page > detailView > change service offering action > display different description vm's state and vm's hypervisor.
(cherry picked from commit d9f5ee8a2ebb001e2a7d213dca7662b74584cc7e)
Signed-off-by: animesh <an...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5fd8aa80
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5fd8aa80
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5fd8aa80
Branch: refs/heads/4.2
Commit: 5fd8aa804a10a859500131be1d2d509dc657c67c
Parents: 111f575
Author: Jessica Wang <je...@apache.org>
Authored: Thu Aug 22 14:00:29 2013 -0700
Committer: animesh <an...@apache.org>
Committed: Thu Aug 22 15:30:10 2013 -0700
----------------------------------------------------------------------
ui/scripts/instances.js | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5fd8aa80/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index b8ffa2d..20d3d9a 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -1278,7 +1278,14 @@
label: 'label.change.service.offering',
createForm: {
title: 'label.change.service.offering',
- desc: 'Please read the dynamic scaling section in the admin guide before scaling up.',
+ desc: function(args) {
+ var description = '';
+ var vmObj = args.jsonObj;
+ if (vmObj.state == 'Running' && vmObj.hypervisor == 'VMware') {
+ description = 'Please read the dynamic scaling section in the admin guide before scaling up.';
+ }
+ return description;
+ },
fields: {
serviceOffering: {
label: 'label.compute.offering',