Rewrote state based redirection

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

diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index fe5f656..8d79d7e 100644 (file)
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -134,7 +134,8 @@ function dispatch(request)
 
        local track = {}
        local args = {}
-       context.args = args
+       ctx.args = args
+       ctx.requestargs = ctx.requestargs or args
        local n
 
        for i, s in ipairs(request) do
@@ -499,7 +500,7 @@ function template(name)
 end
 
 --- Create a CBI model dispatching target.
--- @param      model   CBI model tpo be rendered
+-- @param      model   CBI model to be rendered
 function cbi(model, config)
        config = config or {}
        return function(...)
@@ -521,12 +522,27 @@ function cbi(model, config)
                        end
                end
 
+               if config.on_success_to and state and state > 0 then
+                       luci.http.redirect(config.on_success_to)
+                       return
+               end
+
+               if config.state_handler then
+                       if not config.state_handler(state, maps) then
+                               return
+                       end
+               end
+
+               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", {state = state, autoapply = config.autoapply})
+               luci.template.render("cbi/footer", {pageaction=pageaction, state = state, autoapply = config.autoapply})
        end
 end