luci-0.9: merge r6019

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 e310491ed0bb470868d4939255420689d97c003d..973d6373f5db7316df5c20098d985ae5d6a49739 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
@@ -90,6 +90,13 @@ end
 
 if leases then
        v = m2:section(Table, leases, translate("dhcp_leases_active"))
+
+       name = v:option(DummyValue, 4, translate("hostname"))
+       function name.cfgvalue(self, ...)
+               local value = DummyValue.cfgvalue(self, ...)
+               return (value == "*") and "?" or value
+       end
+
        ip = v:option(DummyValue, 3, translate("ipaddress"))
        
        mac  = v:option(DummyValue, 2, translate("macaddress"))

diff --git a/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua b/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua
index 8959b7cb824c32ea486b029186fd4a442d638b3e..9ed6f0381c86c26c6b8451f81478f3e7064955fe 100644 (file)
--- a/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua
@@ -75,6 +75,11 @@ end
 
 if leases then
        v = m:section(Table, leases, translate("dhcp_leases_active"))
+       name = v:option(DummyValue, 4, translate("hostname"))
+       function name.cfgvalue(self, ...)
+               local value = DummyValue.cfgvalue(self, ...)
+               return (value == "*") and "?" or value
+       end
        ip = v:option(DummyValue, 3, translate("ipaddress"))
        mac  = v:option(DummyValue, 2, translate("macaddress"))
        ltime = v:option(DummyValue, 1, translate("dhcp_timeremain"))