Merge pageactions

[project/luci.git] / libs / web / luasrc / dispatcher.lua

diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index 5a9a0c6..51f6d96 100644 (file)
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -108,6 +108,7 @@ function httpdispatch(request)
 
        local stat, err = util.copcall(dispatch, context.request)
        if not stat then
+               luci.util.perror(err)
                error500(err)
        end
 
@@ -163,7 +164,7 @@ function dispatch(request)
        -- Init template engine
        if (c and c.index) or not track.notemplate then
                local tpl = require("luci.template")
-               local media = luci.config.main.mediaurlbase
+               local media = track.mediaurlbase or luci.config.main.mediaurlbase
                if not pcall(tpl.Template, "themes/%s/header" % fs.basename(media)) then
                        media = nil
                        for name, theme in pairs(luci.config.themes) do
@@ -440,8 +441,12 @@ end
 --- 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
@@ -450,17 +455,23 @@ end
 -- @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
-                       table.remove(context.path, 1)
+                       table.remove(dispatched, 1)
+               end
+
+               for i, r in ipairs(req) do
+                       table.insert(dispatched, i, r)
                end
 
-               for i,r in ipairs(req) do
-                       table.insert(context.path, i, r)
+               for _, r in ipairs({...}) do
+                       dispatched[#dispatched+1] = r
                end
 
-               dispatch()
+               dispatch(dispatched)
        end
 end
 
@@ -469,7 +480,13 @@ end
 -- @param      ...             Additional parameters passed to the function
 function call(name, ...)
        local argv = {...}
-       return function() return getfenv()[name](unpack(argv)) end
+       return function(...)
+               if #argv > 0 then 
+                       return getfenv()[name](unpack(argv), ...)
+               else
+                       return getfenv()[name](...)
+               end
+       end
 end
 
 --- Create a template render dispatching target.
@@ -482,23 +499,38 @@ function template(name)
 end
 
 --- Create a CBI model dispatching target.
--- @param      model   CBI model tpo be rendered
-function cbi(model)
+-- @param      model   CBI model to be rendered
+function cbi(model, config)
+       config = config or {}
        return function(...)
                require("luci.cbi")
                require("luci.template")
+               local http = require "luci.http"
 
                maps = luci.cbi.load(model, ...)
 
+               local state = nil
+
                for i, res in ipairs(maps) do
-                       res:parse()
+                       if config.autoapply then
+                               res.autoapply = config.autoapply
+                       end
+                       local cstate = res:parse()
+                       if not state or cstate < state then
+                               state = cstate
+                       end
                end
 
-               luci.template.render("cbi/header")
+               local pageaction = true
+               http.header("X-CBI-State", state or 0)
+               luci.template.render("cbi/header", {state = state})
                for i, res in ipairs(maps) do
                        res:render()
+                       if res.pageaction == false then
+                               pageaction = false
+                       end
                end
-               luci.template.render("cbi/footer")
+               luci.template.render("cbi/footer", {pageaction=pageaction, state = state, autoapply = config.autoapply})
        end
 end
 
@@ -508,13 +540,20 @@ function form(model)
        return function(...)
                require("luci.cbi")
                require("luci.template")
+               local http = require "luci.http"
 
                maps = luci.cbi.load(model, ...)
 
+               local state = nil
+
                for i, res in ipairs(maps) do
-                       res:parse()
+                       local cstate = res:parse()
+                       if not state or cstate < state then
+                               state = cstate
+                       end
                end
 
+               http.header("X-CBI-State", state or 0)
                luci.template.render("header")
                for i, res in ipairs(maps) do
                        res:render()