From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 2 Jan 2013 15:31:59 +0000 (+0000)
Subject: modules/admin-full: make mac addresses optional in static lease configuration
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7a531b4add84d2d25a666e3e988a68ffa2149b6f;p=project%2Fluci.git

modules/admin-full: make mac addresses optional in static lease configuration
---

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 bf8418f812..98f9d8ecf9 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("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
 mac.datatype = "list(macaddr)"
+mac.rmempty  = true
 
 ip = s:option(Value, "ip", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-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