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

cloudStack 3.0 new UI - NaaS - Public network - IP Addresses tab - Add action - Make VLAN ID optional.

Browse Source
This commit is contained in:
Jessica Wang 2011-11-10 14:06:40 -08:00
parent d460fd19cf
commit 449c6dda33
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/scripts/system.js
View File

@ -123,7 +123,7 @@
fields: { fields: {
'gateway': { edit: true, label: 'Gateway' }, 'gateway': { edit: true, label: 'Gateway' },
'netmask': { edit: true, label: 'Netmask' }, 'netmask': { edit: true, label: 'Netmask' },
'vlanid': { edit: true, label: 'VLAN' }, 'vlanid': { edit: true, label: 'VLAN', isOptional: true },
'startip': { edit: true, label: 'Start IP' }, 'startip': { edit: true, label: 'Start IP' },
'endip': { edit: true, label: 'End IP' }, 'endip': { edit: true, label: 'End IP' },
'add-rule': { label: 'Add', addButton: true } 'add-rule': { label: 'Add', addButton: true }
@ -203,11 +203,9 @@
} }
} }
}, },
dataProvider: function(args) { dataProvider: function(args) {
var zoneId = "6e3728bf-0b13-442c-a968-a42015291662"; //temporary until Brian fixes the bug.
//var zoneId = args.context.zones[0].id;
$.ajax({ $.ajax({
url: createURL("listVlanIpRanges&zoneid=" + zoneId), url: createURL("listVlanIpRanges&zoneid=" + args.context.zones[0].id),
dataType: "json", dataType: "json",
success: function(json) { success: function(json) {
var items = json.listvlaniprangesresponse.vlaniprange; var items = json.listvlaniprangesresponse.vlaniprange;
@ -218,8 +216,7 @@
}); });
} }
} }
//??? //???
} }
} }
}, },

4
ui/scripts/ui/multiEdit.js
View File

@ -381,7 +381,7 @@
name: this, name: this,
type: 'text' type: 'text'
}) })
.addClass('required') .addClass(!field.isOptional ? 'required': null)
.attr('disabled', field.isDisabled ? 'disabled' : false) .attr('disabled', field.isDisabled ? 'disabled' : false)
.appendTo( .appendTo(
$('<div>').addClass('range-item').appendTo($range) $('<div>').addClass('range-item').appendTo($range)
@ -393,7 +393,7 @@
name: fieldName, name: fieldName,
type: field.isPassword ? 'password' : 'text' type: field.isPassword ? 'password' : 'text'
}) })
.addClass('required') .addClass(!field.isOptional ? 'required': null)
.attr('disabled', field.isDisabled ? 'disabled' : false) .attr('disabled', field.isDisabled ? 'disabled' : false)
.appendTo($td); .appendTo($td);
} }