diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-10-03 10:30:17 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-10-03 10:30:17 +0000 |
| commit | f3690b2e0349b517b1d8841fe32639460c8ddf9f (patch) | |
| tree | c6b402256243b0b318726f2b2dca9d41f93b80c5 | |
| parent | ea68cd9665394fef2e5b58e381914e98012a7470 (diff) | |
modules/admin-full: fix various issues in iface cbi model
| -rw-r--r-- | modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua | 14 |
1 files changed, 7 insertions, 7 deletions
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 4b2b88b14..fb418d430 100644 --- 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 |