CBI:

Allow skipping of non-routing wizard steps

diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua
index e26558974633903cd1fb050313a3464796d8d511..c318e64b8e3ffe03792fc606fd3385e64922a355 100644 (file)
--- a/libs/cbi/luasrc/cbi.lua
+++ b/libs/cbi/luasrc/cbi.lua
@@ -617,8 +617,12 @@ function Delegator.parse(self, ...)
                self.active = self:get(self.current)
                if type(self.active) ~= "function" then
                        self.active:populate_delegator(self)
                self.active = self:get(self.current)
                if type(self.active) ~= "function" then
                        self.active:populate_delegator(self)

-                       self.active:parse(false)
-                       return FROM_PROCEED
+                       local stat = self.active:parse(false)
+                       if stat == FORM_SKIP then
+                               return self:parse(...)
+                       else
+                               return FORM_PROCEED
+                       end

                else
                        return self:parse(...)
                end
                else
                        return self:parse(...)
                end