* luci/model/admin-full: override scheme for network overview page too to prevent...

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 dab4bb8..300535d 100644 (file)
--- 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.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
 
 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"
        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
 
 
 end
 
 


@@ -100,13 +101,13 @@ txrx = s:option(DummyValue, "_txrx")
 
 function txrx.cfgvalue(self, section)
        local ix = self.map:get(section, "ifname")
 
 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 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 "-"
        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
 
        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")
 
 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]
        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 "-"
        rx = rx and tostring(rx) or "-"
        tx = tx and tostring(tx) or "-"

-       
+

        return string.format("%s / %s", tx, rx)
 end
 
        return string.format("%s / %s", tx, rx)
 end
 

-return m
\ No newline at end of file
+return m