From 9aee1c47a66e8d4dbc4313c6876691d3f546a049 Mon Sep 17 00:00:00 2001 From: Paul Donald Date: Tue, 28 May 2024 01:19:45 +0200 Subject: [PATCH] luci-mod-network: Fill ipset name choice with available firewall ipsets Signed-off-by: Paul Donald --- .../htdocs/luci-static/resources/view/network/dhcp.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js index 9a6240b69f..0621a12d24 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js @@ -277,7 +277,8 @@ return view.extend({ callHostHints(), callDUIDHints(), getDHCPPools(), - network.getNetworks() + network.getNetworks(), + uci.load('firewall') ]); }, @@ -976,6 +977,11 @@ return view.extend({ ss.modaltitle = _('Edit IP set'); so = ss.option(form.DynamicList, 'name', _('Name of the set')); + uci.sections('firewall', 'ipset', function(s) { + console.log('fukt:', s); + if (typeof(s.name) == 'string') + so.value(s.name, s.comment ? '%s (%s)'.format(s.name, s.comment) : s.name); + }); so.rmempty = false; so.editable = false; so.datatype = 'string'; -- 2.30.2