modules/admin-full: fix various issues in iface cbi model

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
index 4b2b88b14761dc1919a39a5f25b1ec49fe8f28bc..fb418d4301c7ac95422ad42d111242d057326f87 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
@@ -354,7 +354,7 @@ if has_6to4 then
 end
 
 if has_relay then
-       rnet = s:taboption("general", Value, "network", translate("Relay between networks"))
+       rnet = s:taboption("general", DynamicList, "network", translate("Relay between networks"))
        rnet.widget = "checkbox"
        rnet.exclude = arg[1]
        rnet.template = "cbi/network_netlist"
@@ -367,7 +367,7 @@ mac = s:taboption("physical", Value, "macaddr", translate("<abbr title=\"Media A
 mac:depends("proto", "none")
 mac:depends("proto", "static")
 mac:depends("proto", "dhcp")
-mac.placeholder = ifc and ifc:mac():upper()
+mac.placeholder = ifc and ifc:mac()
 
 if has_3g then
        service = s:taboption("general", ListValue, "service", translate("Service type"))
@@ -577,11 +577,11 @@ if has_relay then
        retry.datatype     = "uinteger"
        retry:depends("proto", "relay")
 
-       table = s:taboption("relay", Value, "table", translate("Routing table ID"))
-       table.optional     = true
-       table.placeholder  = 16800
-       table.datatype     = "uinteger"
-       table:depends("proto", "relay")
+       tableid = s:taboption("relay", Value, "table", translate("Routing table ID"))
+       tableid.optional     = true
+       tableid.placeholder  = 16800
+       tableid.datatype     = "uinteger"
+       tableid:depends("proto", "relay")
 end
 
 if has_ahcp then