From 19758fae439cffad8adaf64f2e8f74ae452816ee Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Sun, 22 Nov 2009 20:32:56 +0000
Subject: CBI: Implement reverse dependencies Allow wiazrd steps without
 buttons

---
 libs/cbi/luasrc/cbi.lua                | 1 +
 libs/cbi/luasrc/view/cbi/delegator.htm | 4 +++-
 libs/cbi/luasrc/view/cbi/header.htm    | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'libs/cbi/luasrc')

diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua
index 9b947cb2f0..e265589746 100644
--- a/libs/cbi/luasrc/cbi.lua
+++ b/libs/cbi/luasrc/cbi.lua
@@ -616,6 +616,7 @@ function Delegator.parse(self, ...)
 		self.current = newcurrent or self.current
 		self.active = self:get(self.current)
 		if type(self.active) ~= "function" then
+			self.active:populate_delegator(self)
 			self.active:parse(false)
 			return FROM_PROCEED
 		else
diff --git a/libs/cbi/luasrc/view/cbi/delegator.htm b/libs/cbi/luasrc/view/cbi/delegator.htm
index 08c1fe7c3a..a4a62af640 100644
--- a/libs/cbi/luasrc/view/cbi/delegator.htm
+++ b/libs/cbi/luasrc/view/cbi/delegator.htm
@@ -17,6 +17,7 @@ $Id$
 <% for _, x in ipairs(self.chain) do %>
 		<input type="hidden" name="cbi.delg.path" value="<%=x%>" />
 <% end %>
+<% if not self.disallow_pageactions then %>
 <% if self.allow_back and self:get_prev(self.current) then %>
 		<input class="cbi-button cbi-button-back" type="submit" name="cbi.delg.back" value="<%:« Back%>" />
 <% end %>
@@ -30,6 +31,7 @@ $Id$
 	<input class="cbi-button cbi-button-finish" type="submit" value="<%:Finish%>" />
 <% elseif self:get_next(self.current) then %>
 		<input class="cbi-button cbi-button-next" type="submit" value="<%:Next »%>" />
+<% end %>
 <% end %>
 		<script type="text/javascript">cbi_d_update();</script>
-	</div>
+	</div>
\ No newline at end of file
diff --git a/libs/cbi/luasrc/view/cbi/header.htm b/libs/cbi/luasrc/view/cbi/header.htm
index c831b0df1c..bece16bb2a 100644
--- a/libs/cbi/luasrc/view/cbi/header.htm
+++ b/libs/cbi/luasrc/view/cbi/header.htm
@@ -14,7 +14,7 @@ $Id$
 -%>
 
 <%+header%>
-<form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data">
+<form method="post" name="cbi" action="<%=REQUEST_URI%>" enctype="multipart/form-data">
 	<div>
 		<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
 		<input type="hidden" name="cbi.submit" value="1" />
-- 
cgit v1.2.3