From 7626b810be3f32dea83b70437ca538c1034ef0e3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20H=C3=A4rdeman?= Date: Mon, 20 Oct 2025 23:46:22 +0200 Subject: [PATCH] luci-mod-network: move var ipaddrs in dhcp.js MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Move var ipaddrs down to the sole place where it is used. Signed-off-by: David Härdeman --- .../luci-static/resources/view/network/dhcp.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) 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 07791ea048..3ed68427c5 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 @@ -294,15 +294,6 @@ return view.extend({ s.tab('relay', _('Relay')); s.tab('pxe_tftp', _('PXE/TFTP')); - var ipaddrs = {}; - - Object.keys(hosts).forEach(function(mac) { - var addrs = L.toArray(hosts[mac].ipaddrs || hosts[mac].ipv4); - - for (var i = 0; i < addrs.length; i++) - ipaddrs[addrs[i]] = hosts[mac].name || mac; - }); - // Begin general s.taboption('general', form.Flag, 'authoritative', _('Authoritative'), @@ -503,7 +494,13 @@ return view.extend({ return _('The IP address is outside of any DHCP pool address range'); }; + var ipaddrs = {}; + Object.keys(hosts).forEach(function(mac) { + var addrs = L.toArray(hosts[mac].ipaddrs || hosts[mac].ipv4); + for (var i = 0; i < addrs.length; i++) + ipaddrs[addrs[i]] = hosts[mac].name || mac; + }); L.sortedKeys(ipaddrs, null, 'addr').forEach(function(ipv4) { so.value(ipv4, ipaddrs[ipv4] ? '%s (%s)'.format(ipv4, ipaddrs[ipv4]) : ipv4); }); -- 2.30.2