cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject [1/3] git commit: updated refs/heads/4.2-forward to 3b63b22
Date Thu, 22 Aug 2013 22:03:20 GMT
Updated Branches:
  refs/heads/4.2-forward 52f08a4f3 -> 3b63b22fe


CLOUDSTACK-4102: UI > instances page > detailView > change service offering action
> display different description vm's state and vm's hypervisor.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d9f5ee8a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d9f5ee8a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d9f5ee8a

Branch: refs/heads/4.2-forward
Commit: d9f5ee8a2ebb001e2a7d213dca7662b74584cc7e
Parents: da54e06
Author: Jessica Wang <jessicawang@apache.org>
Authored: Thu Aug 22 14:00:29 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Thu Aug 22 15:03:06 2013 -0700

----------------------------------------------------------------------
 ui/scripts/instances.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d9f5ee8a/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',


Mime
View raw message