From 7a531b4add84d2d25a666e3e988a68ffa2149b6f Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 2 Jan 2013 15:31:59 +0000 Subject: [PATCH] modules/admin-full: make mac addresses optional in static lease configuration --- modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua index bf8418f81..98f9d8ecf 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua @@ -236,6 +236,7 @@ name.rmempty = true mac = s:option(Value, "mac", translate("MAC-Address")) mac.datatype = "list(macaddr)" +mac.rmempty = true ip = s:option(Value, "ip", translate("IPv4-Address")) ip.datatype = "ip4addr" @@ -248,5 +249,14 @@ sys.net.arptable(function(entry) ) end) +function ip.validate(self, value, section) + local m = mac:formvalue(section) or "" + local n = name:formvalue(section) or "" + if value and #n == 0 and #m == 0 then + return nil, translate("One of hostname or mac address must be specified!") + end + return Value.validate(self, value, section) +end + return m -- 2.11.0