cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/master to f2fe127
Date Tue, 09 Dec 2014 01:14:02 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 417239e44 -> f2fe12790


CLOUDSTACK-8023: UI > VM wizard > network > trigger event handler of event "cloudStack.module.instanceWizard.network.dataProvider"
to get networkObjsToPopulate if module is enabled.


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

Branch: refs/heads/master
Commit: f2fe127901467d275089e69c60cfa6d68e870e4b
Parents: 417239e
Author: Jessica Wang <jessicawang@apache.org>
Authored: Mon Dec 8 17:13:09 2014 -0800
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Mon Dec 8 17:13:09 2014 -0800

----------------------------------------------------------------------
 ui/scripts/instanceWizard.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f2fe1279/ui/scripts/instanceWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index c5cb6ff..d9e7bef 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -568,6 +568,21 @@
                         }
                     }
 
+                                                        
+                    // get networkObjsToPopulate
+                    $(window).removeData("cloudStack.module.instanceWizard.networkObjs");
                
+                    $(window).trigger("cloudStack.module.instanceWizard.network.dataProvider",
{
+                    	context: args.context,
+                    	currentData: args.currentData,
+                    	networkObjsToPopulate: networkObjsToPopulate
+                    });                     
+                    if ($(window).data("cloudStack.module.instanceWizard.networkObjs") ==
undefined) {  
+    	                //do nothing         
+                    } else {                      	
+                    	networkObjsToPopulate = $(window).data("cloudStack.module.instanceWizard.networkObjs");
//override networkObjsToPopulate           	
+                    }                    
+                    
+                    
                     $.ajax({
                         url: createURL("listNetworkOfferings"),
                         dataType: "json",


Mime
View raw message