Merge pageactions

2 files changed, 8 insertions, 3 deletions

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 -%>
 	<div class="cbi-page-actions">
 		<% if not autoapply then%>
 			<input class="cbi-button cbi-button-apply" type="submit" name="cbi.apply" value="<%:saveapply%>" />
@@ -21,5 +21,6 @@ $Id$
 		<input class="cbi-button cbi-button-reset" type="reset" value="<%:reset%>" />
 		<script type="text/javascript">cbi_d_update();</script>
 	</div>
+	<%- end -%>
 </form>
 <%+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