summaryrefslogtreecommitdiffhomepage
path: root/modules
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2008-09-13 04:44:03 +0000
committerJo-Philipp Wich <jow@openwrt.org>2008-09-13 04:44:03 +0000
commitd124dd9bb5f843c2f3c73a37a04c4df470468f1e (patch)
tree89b71a1b9a0b35a034ad0585d371d9dfd99d8901 /modules
parenta8d165a5bf5c40b277b9a2b841c3f83d9d213612 (diff)
* luci/model/admin-full: override scheme for network overview page too to prevent "network.foo.ifname has no value" errors after wifi config created a new network on demand
Diffstat (limited to 'modules')
-rw-r--r--modules/admin-full/luasrc/model/cbi/admin_network/network.lua17
1 files changed, 9 insertions, 8 deletions
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/network.lua b/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
index dab4bb873a..300535d6da 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
@@ -25,6 +25,7 @@ s = m:section(TypedSection, "interface", "")
s.addremove = true
s.extedit = luci.dispatcher.build_url("admin", "network", "network") .. "/%s"
s.template = "cbi/tblsection"
+s.override_scheme = true
function s.filter(self, section)
return section ~= "loopback" and section
@@ -86,7 +87,7 @@ function hwaddr.cfgvalue(self, section)
return luci.fs.readfile("/sys/class/net/" .. ix .. "/address")
or luci.util.exec("ifconfig " .. ix):match(" ([A-F0-9:]+)%s*\n")
or "n/a"
-
+
end
@@ -100,13 +101,13 @@ txrx = s:option(DummyValue, "_txrx")
function txrx.cfgvalue(self, section)
local ix = self.map:get(section, "ifname")
-
+
local rx = netstat and netstat[ix] and netstat[ix][1]
rx = rx and luci.tools.webadmin.byte_format(tonumber(rx)) or "-"
-
+
local tx = netstat and netstat[ix] and netstat[ix][9]
tx = tx and luci.tools.webadmin.byte_format(tonumber(tx)) or "-"
-
+
return string.format("%s / %s", tx, rx)
end
@@ -114,14 +115,14 @@ errors = s:option(DummyValue, "_err")
function errors.cfgvalue(self, section)
local ix = self.map:get(section, "ifname")
-
+
local rx = netstat and netstat[ix] and netstat[ix][3]
local tx = netstat and netstat[ix] and netstat[ix][11]
-
+
rx = rx and tostring(rx) or "-"
tx = tx and tostring(tx) or "-"
-
+
return string.format("%s / %s", tx, rx)
end
-return m \ No newline at end of file
+return m