apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-537: cloudstack UI - Advanced SG-enabled zone - VM Wizard - remove obsolete variable(myNetworks), rename variable sharedNetworks to networkObjs.

Browse Source
This commit is contained in:
Jessica Wang 2013-01-21 15:53:29 -08:00
parent bfdec24de4
commit ff5477d1f1
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ui/scripts/instanceWizard.js
View File

@ -399,9 +399,8 @@
args.response.success({ args.response.success({
type: 'select-network', type: 'select-network',
data: { data: {
myNetworks: [], //not used any more networkObjs: networkObjs,
sharedNetworks: networkObjs,
securityGroups: [], securityGroups: [],
networkOfferings: networkOfferingObjs, networkOfferings: networkOfferingObjs,
vpcs: vpcObjs vpcs: vpcObjs
@ -432,9 +431,8 @@
}); });
args.response.success({ args.response.success({
type: 'select-security-group', type: 'select-security-group',
data: { data: {
myNetworks: [], //not used any more networkObjs: [],
sharedNetworks: [],
securityGroups: securityGroupArray, securityGroups: securityGroupArray,
networkOfferings: [], networkOfferings: [],
vpcs: [] vpcs: []
@ -445,9 +443,8 @@
else if(step5ContainerType == 'nothing-to-select') { else if(step5ContainerType == 'nothing-to-select') {
args.response.success({ args.response.success({
type: 'nothing-to-select', type: 'nothing-to-select',
data: { data: {
myNetworks: [], //not used any more networkObjs: [],
sharedNetworks: [],
securityGroups: [], securityGroups: [],
networkOfferings: [], networkOfferings: [],
vpcs: [] vpcs: []

2
ui/scripts/ui-custom/instanceWizard.js
View File

@ -636,7 +636,7 @@
// My networks // My networks
$step.find('.my-networks .select-container').append( $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', name: 'name',
desc: 'type', desc: 'type',
id: 'id' id: 'id'