etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 12534: Add Guest network - remove isDefault checkbox.

This commit is contained in:
Jessica Wang 2011-12-14 14:05:44 -08:00
parent c20f467aee
commit 8a0350ec95
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ui/scripts/system.js
View File

@ -518,8 +518,7 @@
createForm: {
title: 'Create network',
preFilter: function(args) {
if(selectedZoneObj.networktype == "Basic") {
args.$form.find('.form-item[rel=isDefault]').hide();
if(selectedZoneObj.networktype == "Basic") {
args.$form.find('.form-item[rel=vlanTagged]').hide();
args.$form.find('.form-item[rel=vlanId]').hide();
args.$form.find('.form-item[rel=scope]').hide();
@ -529,8 +528,7 @@
args.$form.find('.form-item[rel=podId]').css('display', 'inline-block');
}
else { //"Advanced"
args.$form.find('.form-item[rel=isDefault]').css('display', 'inline-block');
else { //"Advanced"
args.$form.find('.form-item[rel=vlanTagged]').css('display', 'inline-block');
args.$form.find('.form-item[rel=vlanId]').css('display', 'inline-block');
args.$form.find('.form-item[rel=scope]').css('display', 'inline-block');
@ -549,11 +547,7 @@
description: {
label: 'Description',
validation: { required: true }
},
isDefault: {
label: "Default",
isBoolean: true
},
},
vlanTagged: {
label: 'VLAN',
select: function(args) {
@ -787,8 +781,7 @@
else { //zone-wide
array1.push("&acltype=domain"); //server-side will make it Root domain (i.e. domainid=1)
}
array1.push("&isDefault=" + (args.data.isDefault=="on"));
array1.push("&gateway=" + args.data.guestGateway);
array1.push("&netmask=" + args.data.guestNetmask);
array1.push("&startip=" + args.data.guestStartIp);
@ -1066,11 +1059,7 @@
else if(booleanValue == false)
return "No";
},
},
isdefault: {
label: 'Default',
converter: cloudStack.converters.toBooleanText
},
},
vlan: { label: 'VLAN ID' },
networkofferingdisplaytext: { label: 'Network offering' },