summaryrefslogtreecommitdiffhomepage
path: root/libs/cbi/luasrc
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2009-11-22 20:32:56 +0000
committerSteven Barth <steven@midlink.org>2009-11-22 20:32:56 +0000
commit19758fae439cffad8adaf64f2e8f74ae452816ee (patch)
tree55339f37986fbc586131f2e8336e0ed0cc6262fa /libs/cbi/luasrc
parentbbfdc9ea830aa14bd3d3ee7a394ba19fe707c9aa (diff)
CBI:
Implement reverse dependencies Allow wiazrd steps without buttons
Diffstat (limited to 'libs/cbi/luasrc')
-rw-r--r--libs/cbi/luasrc/cbi.lua1
-rw-r--r--libs/cbi/luasrc/view/cbi/delegator.htm4
-rw-r--r--libs/cbi/luasrc/view/cbi/header.htm2
3 files changed, 5 insertions, 2 deletions
diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua
index 9b947cb2f..e26558974 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 08c1fe7c3..a4a62af64 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 %>
@@ -31,5 +32,6 @@ $Id$
<% 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 c831b0df1..bece16bb2 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" />