projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Publish status data
[project/luci.git]
/
libs
/
web
/
luasrc
/
dispatcher.lua
diff --git
a/libs/web/luasrc/dispatcher.lua
b/libs/web/luasrc/dispatcher.lua
index
d58987a
..
03e7c7d
100644
(file)
--- a/
libs/web/luasrc/dispatcher.lua
+++ b/
libs/web/luasrc/dispatcher.lua
@@
-440,8
+440,12
@@
end
--- Create a redirect to another dispatching node.
-- @param ... Virtual path destination
function alias(...)
--- Create a redirect to another dispatching node.
-- @param ... Virtual path destination
function alias(...)
- local req = arg
- return function()
+ local req = {...}
+ return function(...)
+ for _, r in ipairs({...}) do
+ req[#req+1] = r
+ end
+
dispatch(req)
end
end
dispatch(req)
end
end
@@
-450,17
+454,23
@@
end
-- @param n Number of path values to replace
-- @param ... Virtual path to replace removed path values with
function rewrite(n, ...)
-- @param n Number of path values to replace
-- @param ... Virtual path to replace removed path values with
function rewrite(n, ...)
- local req = arg
- return function()
+ local req = {...}
+ return function(...)
+ local dispatched = util.clone(context.dispatched)
+
for i=1,n do
for i=1,n do
- table.remove(context.path, 1)
+ table.remove(dispatched, 1)
+ end
+
+ for i, r in ipairs(req) do
+ table.insert(dispatched, i, r)
end
end
- for
i,r in ipairs(req
) do
- table.insert(context.path, i, r)
+ for
_, r in ipairs({...}
) do
+ dispatched[#dispatched+1] = r
end
end
- dispatch()
+ dispatch(
dispatched
)
end
end
end
end
@@
-507,11
+517,11
@@
function cbi(model)
end
http.header("X-CBI-State", state or 0)
end
http.header("X-CBI-State", state or 0)
- luci.template.render("cbi/header")
+ luci.template.render("cbi/header"
, {state = state}
)
for i, res in ipairs(maps) do
res:render()
end
for i, res in ipairs(maps) do
res:render()
end
- luci.template.render("cbi/footer")
+ luci.template.render("cbi/footer"
, {state = state}
)
end
end
end
end