* Fixed DHCP configuration for devices without WAN interface

* Made interface selector for route configuration a ListValue

diff --git a/module/admin-core/src/model/cbi/admin_network/dhcp.lua b/module/admin-core/src/model/cbi/admin_network/dhcp.lua
index 766d87da2f526a62b37363dd06cbc948bab61e54..c8f1007ff2407135e2e59ef52b203118d14b59a7 100644 (file)
--- a/module/admin-core/src/model/cbi/admin_network/dhcp.lua
+++ b/module/admin-core/src/model/cbi/admin_network/dhcp.lua
@@ -13,6 +13,7 @@ iface = s:option(ListValue, "interface", "Schnittstelle")
 for k, v in pairs(ffluci.model.uci.show("network").network) do
        if v[".type"] == "interface" and k ~= "loopback" then
                iface:value(k)
+               s:depends("interface", k) -- Only change sections with existing interfaces
        end
 end
 

diff --git a/module/admin-core/src/model/cbi/admin_network/routes.lua b/module/admin-core/src/model/cbi/admin_network/routes.lua
index fb83916781885ab03022395b7410fd883cd5148f..35f54235795b02a650c81cc46ec4fde3476d1da0 100644 (file)
--- a/module/admin-core/src/model/cbi/admin_network/routes.lua
+++ b/module/admin-core/src/model/cbi/admin_network/routes.lua
@@ -7,7 +7,12 @@ s = m:section(TypedSection, "route")
 s.addremove = true
 s.anonymous = true
 
-s:option(Value, "interface", "Schnittstelle")
+iface = s:option(ListValue, "interface", "Schnittstelle")
+for k, v in pairs(ffluci.model.uci.show("network").network) do
+       if v[".type"] == "interface" and k ~= "loopback" then
+               iface:value(k)
+       end
+end
 
 s:option(Value, "target", "Ziel", "Host-IP oder Netzwerk")