apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-19 12:03:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 12534: cloudStack 3.0 new UI - zone chart - management - details - remove GuestCIDR field since it's no longer under a zone.

Browse Source
This commit is contained in:
Jessica Wang 2011-12-14 16:37:57 -08:00
parent 20e9f40a53
commit 27ff5e7b51
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ui/scripts/system.js
View File

@ -292,6 +292,7 @@
} }
} }
}, },
'management': { 'management': {
detailView: { detailView: {
viewAll: { path: '_zone.pods', label: 'Pods' }, viewAll: { path: '_zone.pods', label: 'Pods' },
@ -304,16 +305,8 @@
array1.push("&dns1=" + todb(args.data.dns1)); array1.push("&dns1=" + todb(args.data.dns1));
array1.push("&dns2=" + todb(args.data.dns2)); //dns2 can be empty ("") when passed to API array1.push("&dns2=" + todb(args.data.dns2)); //dns2 can be empty ("") when passed to API
array1.push("&internaldns1=" + todb(args.data.internaldns1)); array1.push("&internaldns1=" + todb(args.data.internaldns1));
array1.push("&internaldns2=" + todb(args.data.internaldns2)); //internaldns2 can be empty ("") when passed to API array1.push("&internaldns2=" + todb(args.data.internaldns2)); //internaldns2 can be empty ("") when passed to API
array1.push("&domain=" + todb(args.data.domain));
if(args.context.zones[0].networktype == "Advanced") { //remove this line after Brian fixes it to include $form in args
//if(args.$form.find('.form-item[rel=guestcidraddress]').css("display") != "none") { //commented out until Brian fixes it to include $form in args
array1.push("&guestcidraddress=" + todb(args.data.guestcidraddress));
//} //commented out until Brian fixes it to include $form in args
} //remove this line after Brian fixes it to include $form in args
array1.push("&domain=" + todb(args.data.domain));
$.ajax({ $.ajax({
url: createURL("updateZone&id=" + args.context.zones[0].id + array1.join("")), url: createURL("updateZone&id=" + args.context.zones[0].id + array1.join("")),
dataType: "json", dataType: "json",
@ -328,13 +321,7 @@
}, },
tabs: { tabs: {
details: { details: {
title: 'Details', title: 'Details',
preFilter: function(args) {
var hiddenFields = [];
if(selectedZoneObj.networktype == "Basic")
hiddenFields.push("guestcidraddress");
return hiddenFields;
},
fields: [ fields: [
{ {
name: { label: 'Zone', isEditable: true } name: { label: 'Zone', isEditable: true }
@ -354,8 +341,7 @@
domain: { domain: {
label: 'Network domain', label: 'Network domain',
isEditable: true isEditable: true
}, }
guestcidraddress: { label: 'Guest CIDR Address', isEditable: true } //only advanced zones have CIDR Address
} }
], ],
dataProvider: function(args) { dataProvider: function(args) {