mirror of
https://git.proxmox.com/git/pve-manager
synced 2025-08-06 10:42:21 +00:00
use new API for IPSetSelector
We now list all available IPSets and Aliases.
This commit is contained in:
parent
3e6177d94b
commit
ec549ebc13
@ -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
|
||||
|
@ -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
|
||||
},
|
||||
|
@ -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'
|
||||
}
|
||||
];
|
||||
|
Loading…
Reference in New Issue
Block a user