cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject [3/3] git commit: updated refs/heads/master to 2e56e7b
Date Thu, 22 Aug 2013 22:05:02 GMT
CLOUDSTACK-4102: UI > Instracture > SystemVM / VirtualRouter > detailView > change
service offering action - display different description based on VM's state.


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

Branch: refs/heads/master
Commit: 2e56e7b02c6c1dd5104d4b736f4d354365fdfcea
Parents: ecccb88
Author: Jessica Wang <jessicawang@apache.org>
Authored: Thu Aug 22 14:09:45 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Thu Aug 22 15:04:48 2013 -0700

----------------------------------------------------------------------
 ui/scripts/system.js | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e56e7b0/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 68c31e2..8ba1a53 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -6639,7 +6639,15 @@
                                                         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') { //needs to wait for API fix that will return hypervisor
property
+                                                            	if (vmObj.state == 'Running')
{	
+                                                            		description = 'Please read
the dynamic scaling section in the admin guide before scaling up.';
+                                                            	}                          
  
+                                                                return description;     
            	                
+                                                            },
                                                             fields: {
                                                                 serviceOfferingId: {
                                                                     label: 'label.compute.offering',
@@ -7606,7 +7614,15 @@
                                 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') { //needs to wait for API fix that will return hypervisor property
+                                    	if (vmObj.state == 'Running') {	
+                                    		description = 'Please read the dynamic scaling section
in the admin guide before scaling up.';
+                                    	}                             
+                                        return description;                  	          
     
+                                    },
                                     fields: {
                                         serviceOfferingId: {
                                             label: 'label.compute.offering',
@@ -8155,7 +8171,15 @@
                                 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') { //needs to wait for API fix that will return hypervisor property
+                                    	if (vmObj.state == 'Running') {	
+                                    		description = 'Please read the dynamic scaling section
in the admin guide before scaling up.';
+                                    	}                             
+                                        return description;                  	          
     
+                                    },
                                     fields: {
                                         serviceOfferingId: {
                                             label: 'label.compute.offering',


Mime
View raw message