etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
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.

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({
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: []

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

@ -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'