alex
/
gluon-firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gluon-config-mode-core, gluon-web-*: do not access dispatcher directly

This commit is contained in:
Matthias Schiffer 2018-02-25 05:44:25 +01:00
parent 4a8283b5ab
commit 661e4dee9f
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
4 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/gluon-config-mode-core/luasrc/lib/gluon/web/model/gluon-config-mode/wizard.lua
View File

@ -1,4 +1,3 @@
local disp = require 'gluon.web.dispatcher'
local fs = require "nixio.fs"
local util = require "gluon.web.util"
local nixio_util = require "nixio.util"

1
package/gluon-web-admin/luasrc/lib/gluon/web/controller/admin/upgrade.lua
View File

@ -30,7 +30,6 @@ local function filehandler(meta, chunk, eof)
end
local function action_upgrade(http, renderer)
local disp = require 'gluon.web.dispatcher'
local nixio = require 'nixio'
local function fork_exec(...)

34
package/gluon-web-theme/files/lib/gluon/web/view/themes/gluon/layout.html
View File

@ -10,7 +10,6 @@ You may obtain a copy of the License at
-%>
<%
local uci = require("simple-uci").cursor()
local disp = require "gluon.web.dispatcher"
local fs = require "nixio.fs"
local pretty_hostname = require "pretty_hostname"
@ -23,9 +22,34 @@ You may obtain a copy of the License at
local category = request[1]
local cattree = category and node(category)
local categories = disp.node_children(root)
local function node_visible(node)
return (
node.title and
node.target and
(not node.hidden)
)
end
http:prepare_content("application/xhtml+xml")
local function node_children(node)
if not node then return {} end
local ret = {}
for k, v in pairs(node.nodes) do
if node_visible(v) then
table.insert(ret, k)
end
end
table.sort(ret,
function(a, b)
return (node.nodes[a].order or 100)
< (node.nodes[b].order or 100)
end
)
return ret
end
local categories = node_children(root)
local function append(xs, x)
local r = {unpack(xs)}
@ -40,7 +64,7 @@ You may obtain a copy of the License at
local function subtree(prefix, node, name, ...)
if not node then return end
local children = disp.node_children(node)
local children = node_children(node)
if #children == 0 then return end
%>
@ -69,6 +93,8 @@ You may obtain a copy of the License at
local function menutree(path, ...)
subtree({path}, root.nodes[category], ...)
end
http:prepare_content("application/xhtml+xml")
-%>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang="">

27
package/gluon-web/luasrc/usr/lib/lua/gluon/web/dispatcher.lua
View File

@ -20,33 +20,6 @@ function redirect(http, ...)
http:redirect(build_url(http, {...}))
end
function node_visible(node)
return (
node.title and
node.target and
(not node.hidden)
)
end
function node_children(node)
if not node then return {} end
local ret = {}
for k, v in pairs(node.nodes) do
if node_visible(v) then
table.insert(ret, k)
end
end
table.sort(ret,
function(a, b)
return (node.nodes[a].order or 100)
< (node.nodes[b].order or 100)
end
)
return ret
end
function httpdispatch(http)
local request = {}