diff --git a/VERSION b/VERSION index 459d4bfb..daec3cd8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.3.0 (2012-12-05 15:32:52) rc1 +Version 2.3.0 (2012-12-05 16:34:11) rc1 diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index fa54ba6f..f3885a21 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -1313,8 +1313,8 @@ class SQLFORM(FORM): not OptionsWidget.has_options(field): field.widget = self.widgets.list.widget if field.widget and fieldname in request_vars: - if fieldname in self.vars: - value = self.vars[fieldname] + if fieldname in self.request_vars: + value = self.request_vars[fieldname] elif self.record: value = self.record[fieldname] else: @@ -1327,7 +1327,8 @@ class SQLFORM(FORM): parent = self.field_parent[row_id] if parent: parent.components = [widget] - parent._traverse(False, hideerror) + if self.errors.get(fieldname): + parent._traverse(False, hideerror) self.custom.widget[fieldname] = widget self.accepted = ret return ret