incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [7/50] [abbrv] git commit: CLOUDSTACK-537: cloudstack UI - Advanced SG-enabled zone - VM Wizard - remove obsolete variable(myNetworks), rename variable sharedNetworks to networkObjs.
Date Fri, 25 Jan 2013 03:31:52 GMT
CLOUDSTACK-537: cloudstack UI - Advanced SG-enabled zone - VM Wizard - remove obsolete variable(myNetworks),
rename variable sharedNetworks to networkObjs.


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

Branch: refs/heads/javelin
Commit: ff5477d1f13c22c8ab2c1a80a8b87f474274cc01
Parents: bfdec24
Author: Jessica Wang <jessica.wang@citrix.com>
Authored: Mon Jan 21 15:53:29 2013 -0800
Committer: Jessica Wang <jessica.wang@citrix.com>
Committed: Mon Jan 21 15:53:29 2013 -0800

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


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ff5477d1/ui/scripts/instanceWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index 8d064d8..47908c2 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: []

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ff5477d1/ui/scripts/ui-custom/instanceWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/instanceWizard.js b/ui/scripts/ui-custom/instanceWizard.js
index f2cfd9c..d1f2507 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'


Mime
View raw message