From: Paul Donald <newtwen+github@gmail.com>
Date: Mon, 27 May 2024 23:19:45 +0000 (+0200)
Subject: luci-mod-network: Fill ipset name choice with available firewall ipsets
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9aee1c47a66e8d4dbc4313c6876691d3f546a049;p=project%2Fluci.git

luci-mod-network: Fill ipset name choice with available firewall ipsets

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
---

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';