summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2009-03-26 12:39:43 +0000
committerSteven Barth <steven@midlink.org>2009-03-26 12:39:43 +0000
commit8368432a63567d73101a9ea05f7f862065ba0cff (patch)
tree2f7b23cde36ab61cc1175aca10ee78b8d35ffa72
parentb9fbed39cae20547106239127468ad0c0a5d9fea (diff)
Fix last commit
-rw-r--r--libs/cbi/luasrc/cbi.lua12
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua
index aea9b485e..4bed9b0e6 100644
--- a/libs/cbi/luasrc/cbi.lua
+++ b/libs/cbi/luasrc/cbi.lua
@@ -378,13 +378,13 @@ function Map.parse(self, readinput, ...)
end
end
- if self.proceed then
- self.state = FORM_PROCEED
- elseif self:submitstate() then
- if self.save then
- self.state = self.changed and FORM_CHANGED or FORM_VALID
- else
+ if self:submitstate() then
+ if not self.save then
self.state = FORM_INVALID
+ elseif self.proceed then
+ self.state = FORM_PROCEED
+ else
+ self.state = self.changed and FORM_CHANGED or FORM_VALID
end
else
self.state = FORM_NODATA