web/formfields.py
changeset 10006 8391bf718485
parent 9821 2077c8da1893
child 10012 8c2c6fdd8d56
equal deleted inserted replaced
10005:7769d0f61810 10006:8391bf718485
   347         return self.initial_typed_value(form, load_bytes)
   347         return self.initial_typed_value(form, load_bytes)
   348 
   348 
   349     def initial_typed_value(self, form, load_bytes):
   349     def initial_typed_value(self, form, load_bytes):
   350         if self.value is not _MARKER:
   350         if self.value is not _MARKER:
   351             if callable(self.value):
   351             if callable(self.value):
   352                 # pylint: disable=E1102
   352                 return self.value(form, self)
   353                 if support_args(self.value, 'form', 'field'):
       
   354                     return self.value(form, self)
       
   355                 else:
       
   356                     warn("[3.10] field's value callback must now take form and "
       
   357                          "field as argument (%s)" % self, DeprecationWarning)
       
   358                     return self.value(form)
       
   359             return self.value
   353             return self.value
   360         formattr = '%s_%s_default' % (self.role, self.name)
   354         formattr = '%s_%s_default' % (self.role, self.name)
   361         if self.eidparam and self.role is not None:
   355         if self.eidparam and self.role is not None:
   362             if form._cw.vreg.schema.rschema(self.name).final:
   356             if form._cw.vreg.schema.rschema(self.name).final:
   363                 return form.edited_entity.e_schema.default(self.name)
   357                 return form.edited_entity.e_schema.default(self.name)