From 7aed1e4b9d3d608389a8b15ea800b8e75be967ef Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Tue, 10 Nov 2009 16:02:48 +0000
Subject: NIU: More pages

---
 libs/cbi/luasrc/cbi.lua | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'libs/cbi/luasrc/cbi.lua')

diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua
index f6a2694b2c..5a1d923853 100644
--- a/libs/cbi/luasrc/cbi.lua
+++ b/libs/cbi/luasrc/cbi.lua
@@ -222,6 +222,12 @@ function Node.__init__(self, title, description)
 end
 
 -- hook helper
+function Node._run_hook(self, hook)
+	if type(self[hook]) == "function" then
+		return self[hook](self)
+	end 
+end
+
 function Node._run_hooks(self, ...)
 	local f
 	local r = false
@@ -528,9 +534,9 @@ function Delegator.add(self, name, node)
 end
 
 function Delegator.insert_after(self, name, after)
-	local n = #self.chain
+	local n = #self.chain + 1
 	for k, v in ipairs(self.chain) do
-		if v == state then
+		if v == after then
 			n = k + 1
 			break
 		end
@@ -599,8 +605,7 @@ function Delegator.parse(self, ...)
 		return FORM_NODATA
 	elseif stat > FORM_PROCEED 
 	and (not newcurrent or not self:get(newcurrent)) then
-		self:_run_hooks("on_done")
-		return FORM_DONE
+		return self:_run_hook("on_done") or FORM_DONE
 	else
 		self.current = newcurrent or self.current
 		self.active = self:get(self.current)
-- 
cgit v1.2.3