luci-mod-network: improve static lease ip validation logic

m (mac) is an array, and is zero length or greater.

Signed-off-by: Paul Donald <[email protected]>
(cherry picked from commit f6cbda00e77afc26c12da3c31e5f5444cee17422)

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 2c141d307850d7843c2a94ac4f87e626d9319439..2967e99b4735c1da19a7be4a3a20272d85294f1a 100644 (file)
--- 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
@@ -942,10 +942,10 @@ return view.extend({
                        var m = this.section.formvalue(section, 'mac'),
                            n = this.section.formvalue(section, 'name');
 
-                       if ((m == null || m == '') && (n == null || n == ''))
+                       if ((m && !m.length > 0) && !n)
                                return _('One of hostname or MAC address must be specified!');
 
-                       if (value == null || value == '' || value == 'ignore')
+                       if (!value || value == 'ignore')
                                return true;
 
                        var leases = uci.sections('dhcp', 'host');