From: Steven Barth Date: Sat, 1 Nov 2008 17:11:02 +0000 (+0000) Subject: Merge pageactions X-Git-Tag: 0.9.0~1033 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ea9b377ec5585bc3a5745a485f84f3fba8a4935a;p=oweals%2Fluci.git Merge pageactions --- diff --git a/libs/cbi/luasrc/view/cbi/footer.htm b/libs/cbi/luasrc/view/cbi/footer.htm index 6f90bb9cf..4f94a05b0 100644 --- a/libs/cbi/luasrc/view/cbi/footer.htm +++ b/libs/cbi/luasrc/view/cbi/footer.htm @@ -12,7 +12,7 @@ You may obtain a copy of the License at $Id$ -%> - + <%- if pageaction then -%>
<% if not autoapply then%> @@ -21,5 +21,6 @@ $Id$
+ <%- end -%> <%+footer%> diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua index fe5f656ba..51f6d9695 100644 --- a/libs/web/luasrc/dispatcher.lua +++ b/libs/web/luasrc/dispatcher.lua @@ -499,7 +499,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 +521,16 @@ function cbi(model, config) 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