fixed issue 1187, custom widget hadnling error in case for nonzero formatter, thanks Maria Mitica
This commit is contained in:
@@ -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
@@ -1313,8 +1313,8 @@ class SQLFORM(FORM):
|
|||||||
not OptionsWidget.has_options(field):
|
not OptionsWidget.has_options(field):
|
||||||
field.widget = self.widgets.list.widget
|
field.widget = self.widgets.list.widget
|
||||||
if field.widget and fieldname in request_vars:
|
if field.widget and fieldname in request_vars:
|
||||||
if fieldname in self.vars:
|
if fieldname in self.request_vars:
|
||||||
value = self.vars[fieldname]
|
value = self.request_vars[fieldname]
|
||||||
elif self.record:
|
elif self.record:
|
||||||
value = self.record[fieldname]
|
value = self.record[fieldname]
|
||||||
else:
|
else:
|
||||||
@@ -1327,7 +1327,8 @@ class SQLFORM(FORM):
|
|||||||
parent = self.field_parent[row_id]
|
parent = self.field_parent[row_id]
|
||||||
if parent:
|
if parent:
|
||||||
parent.components = [widget]
|
parent.components = [widget]
|
||||||
parent._traverse(False, hideerror)
|
if self.errors.get(fieldname):
|
||||||
|
parent._traverse(False, hideerror)
|
||||||
self.custom.widget[fieldname] = widget
|
self.custom.widget[fieldname] = widget
|
||||||
self.accepted = ret
|
self.accepted = ret
|
||||||
return ret
|
return ret
|
||||||
|
|||||||
Reference in New Issue
Block a user