From: Steven Barth <steven@midlink.org>
Date: Wed, 28 Oct 2009 17:38:11 +0000 (+0000)
Subject: CBI: Delegators: Don't proceed when step is not completed yet
X-Git-Tag: 0.10.0~1053
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e93a3e0c749960deefdde6fb3d0e1a1ee3696b89;p=oweals%2Fluci.git

CBI: Delegators: Don't proceed when step is not completed yet
---

diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua
index 2c8cb53e4..7c20129be 100644
--- a/libs/cbi/luasrc/cbi.lua
+++ b/libs/cbi/luasrc/cbi.lua
@@ -614,11 +614,12 @@ function Delegator.parse(self, ...)
 
 	if not Map.formvalue(self, "cbi.submit") then
 		return FORM_NODATA
-	elseif not newcurrent or not self:get(newcurrent) then
+	elseif stat > FORM_PROCEED 
+	and (not newcurrent or not self:get(newcurrent)) then
 		self:_run_hooks("on_done")
 		return FORM_DONE
 	else
-		self.current = newcurrent
+		self.current = newcurrent or self.current
 		self.active = self:get(self.current)
 		if type(self.active) ~= "function" then
 			self.active:parse(false)