use new API for IPSetSelector

We now list all available IPSets and Aliases.
This commit is contained in:
Dietmar Maurer 2014-05-28 14:16:37 +02:00
parent 3e6177d94b
commit ec549ebc13
3 changed files with 16 additions and 12 deletions

View File

@ -200,7 +200,7 @@ Ext.define('PVE.SecurityGroups', {
var rule_panel = Ext.createWidget('pveFirewallRules', {
region: 'center',
allow_groups: false,
ipset_base_url: '/cluster/firewall/ipset',
ipset_base_url: '/cluster/firewall/refs',
tbar_prefix: '<b>' + gettext('Rules') + ':</b>',
flex: 0.75,
border: false

View File

@ -13,29 +13,33 @@ Ext.define('PVE.form.IPSetSelector', {
var store = Ext.create('Ext.data.Store', {
autoLoad: true,
fields: [ { name: 'name',
convert: function(v) { return '+' + v; }},
'comment' ],
idProperty: 'name',
fields: [ 'type', 'name', 'ref', 'comment' ],
idProperty: 'ref',
proxy: {
type: 'pve',
url: "/api2/json" + me.base_url
},
sorters: {
property: 'name',
property: 'ref',
order: 'DESC'
}
});
Ext.apply(me, {
store: store,
valueField: 'name',
displayField: 'name',
valueField: 'ref',
displayField: 'ref',
listConfig: {
columns: [
{
header: gettext('IPSet'),
dataIndex: 'name',
header: gettext('Type'),
dataIndex: 'type',
hideable: false,
width: 60
},
{
header: gettext('Name'),
dataIndex: 'ref',
hideable: false,
width: 100
},

View File

@ -26,8 +26,8 @@ Ext.define('PVE.panel.Firewall', {
title: 'Rules',
allow_iface: true,
base_url: me.base_url + '/rules',
ipset_base_url: me.fwtype === 'vm' ? (me.base_url + '/ipset') :
'/cluster/firewall/ipset',
ipset_base_url: me.fwtype === 'vm' ? (me.base_url + '/refs') :
'/cluster/firewall/refs',
itemId: 'rules'
}
];