From 2374216100f4267f98a31af0e166ca33328b63e9 Mon Sep 17 00:00:00 2001 From: Paul Donald Date: Thu, 25 Jul 2024 16:22:25 +0200 Subject: [PATCH] luci-mod-network: made expandAndFormatMAC return arrays instead of returning a space separated string follow-up to 5ab0cb1f15bcb31015ae8345d302c6d023ba51e2 Closes #7209 Signed-off-by: Paul Donald (cherry picked from commit 84ffb655b0764d949c7bd4fd5f9502c314b77c58) --- .../htdocs/luci-static/resources/view/network/dhcp.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 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 66abd8eb65..8dc77f5e40 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 @@ -221,7 +221,7 @@ function expandAndFormatMAC(macs) { } }); - return result.length ? result.join(' ') : null; + return result.length ? result : null; } function isValidMAC(sid, s) { @@ -993,8 +993,12 @@ return view.extend({ //As a special case, in DHCPv4, it is possible to include more than one hardware address. eg: --dhcp-host=11:22:33:44:55:66,12:34:56:78:90:12,192.168.0.2 This allows an IP address to be associated with multiple hardware addresses, and gives dnsmasq permission to abandon a DHCP lease to one of the hardware addresses when another one asks for a lease so.rmempty = true; so.cfgvalue = function(section) { - var macs = L.toArray(uci.get('dhcp', section, 'mac')); - return expandAndFormatMAC(macs); + var macs = uci.get('dhcp', section, 'mac'); + if(!Array.isArray(macs)){ + return expandAndFormatMAC(L.toArray(macs)); + } else { + return expandAndFormatMAC(macs); + } }; //removed jows renderwidget function which hindered multi-mac entry so.validate = validateMACAddr.bind(so, pools); -- 2.30.2