Merge pull request #1735 from sumpfralle/olsr-jsoninfo-parser-handle-empty-result

[oweals/luci.git] / modules / luci-mod-network / luasrc / controller / admin / network.lua

diff --git a/modules/luci-mod-network/luasrc/controller/admin/network.lua b/modules/luci-mod-network/luasrc/controller/admin/network.lua
index a381bbc614213c057560bbd6d876a78bd27dcc3a..f8623be93ef03ccc93f6d227648bb8ac79255548 100644 (file)
--- a/modules/luci-mod-network/luasrc/controller/admin/network.lua
+++ b/modules/luci-mod-network/luasrc/controller/admin/network.lua
@@ -18,13 +18,7 @@ function index()
                        end)
 
                if has_switch then
-                       page  = node("admin", "network", "vlan")
-                       page.target = cbi("admin_network/vlan")
-                       page.title  = _("Switch")
-                       page.order  = 20
-
-                       page = entry({"admin", "network", "switch_status"}, call("switch_status"), nil)
-                       page.leaf = true
+                       entry({"admin", "network", "switch"}, view("network/switch"), _("Switch"), 20)
                end
 
 
@@ -271,13 +265,6 @@ function wifi_reconnect(radio)
        end
 end
 
-function switch_status(switches)
-       local s = require "luci.tools.status"
-
-       luci.http.prepare_content("application/json")
-       luci.http.write_json(s.switch_status(switches))
-end
-
 function diag_command(cmd, addr)
        if addr and addr:match("^[a-zA-Z0-9%-%.:_]+$") then
                luci.http.prepare_content("text/plain")