From ff5477d1f13c22c8ab2c1a80a8b87f474274cc01 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica.wang@citrix.com>
Date: Mon, 21 Jan 2013 15:53:29 -0800
Subject: [PATCH] CLOUDSTACK-537: cloudstack UI - Advanced SG-enabled zone - VM
 Wizard - remove obsolete variable(myNetworks), rename variable sharedNetworks
 to networkObjs.

---
 ui/scripts/instanceWizard.js           | 15 ++++++---------
 ui/scripts/ui-custom/instanceWizard.js |  2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index 8d064d838a7..47908c26b80 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -399,9 +399,8 @@
 
         args.response.success({
           type: 'select-network',
-          data: {
-            myNetworks: [], //not used any more
-            sharedNetworks: networkObjs,
+          data: {            
+            networkObjs: networkObjs,
             securityGroups: [],
             networkOfferings: networkOfferingObjs,
             vpcs: vpcObjs
@@ -432,9 +431,8 @@
         });
         args.response.success({
           type: 'select-security-group',
-          data: {
-            myNetworks: [], //not used any more
-            sharedNetworks: [],
+          data: {            
+            networkObjs: [],
             securityGroups: securityGroupArray,
             networkOfferings: [],
             vpcs: []
@@ -445,9 +443,8 @@
       else if(step5ContainerType == 'nothing-to-select') {
         args.response.success({
           type: 'nothing-to-select',
-          data: {
-            myNetworks: [], //not used any more
-            sharedNetworks: [],
+          data: {            
+            networkObjs: [],
             securityGroups: [],
             networkOfferings: [],
             vpcs: []
diff --git a/ui/scripts/ui-custom/instanceWizard.js b/ui/scripts/ui-custom/instanceWizard.js
index f2cfd9ced53..d1f2507e120 100644
--- a/ui/scripts/ui-custom/instanceWizard.js
+++ b/ui/scripts/ui-custom/instanceWizard.js
@@ -636,7 +636,7 @@
 
                   // My networks
                   $step.find('.my-networks .select-container').append(
-                    makeSelects('my-networks', $.merge(args.data.myNetworks, args.data.sharedNetworks), {
+                    makeSelects('my-networks', args.data.networkObjs, {
                       name: 'name',
                       desc: 'type',
                       id: 'id'