fixed issue 1187, custom widget hadnling error in case for nonzero formatter, thanks Maria Mitica

This commit is contained in:
mdipierro
2012-12-05 16:34:55 -06:00
parent f6dc70dd9b
commit fcd960149d
2 changed files with 5 additions and 4 deletions
+1 -1
View File
@@ -1 +1 @@
Version 2.3.0 (2012-12-05 15:32:52) rc1
Version 2.3.0 (2012-12-05 16:34:11) rc1
+4 -3
View File
@@ -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