web/formfields.py
changeset 4269 da0d254f2eb0
parent 4252 6c4f109c2b03
child 4272 12f336008191
equal deleted inserted replaced
4268:e9bed3bc1333 4269:da0d254f2eb0
   683         date = Field.process_form_value(self, form)
   683         date = Field.process_form_value(self, form)
   684         # but for some widgets, it might be simpler to return date objects
   684         # but for some widgets, it might be simpler to return date objects
   685         # directly, so handle that case :
   685         # directly, so handle that case :
   686         if isinstance(date, basestring):
   686         if isinstance(date, basestring):
   687             try:
   687             try:
   688                 date = form.parse_datetime(date, 'Date')
   688                 date = form._cw.parse_datetime(date, 'Date')
   689             except ValueError, ex:
   689             except ValueError, ex:
   690                 raise ProcessFormError(unicode(ex))
   690                 raise ProcessFormError(unicode(ex))
   691         return date
   691         return date
   692 
   692 
   693 
   693 
   699         date = Field.process_form_value(self, form)
   699         date = Field.process_form_value(self, form)
   700         # but for some widgets, it might be simpler to return date objects
   700         # but for some widgets, it might be simpler to return date objects
   701         # directly, so handle that case :
   701         # directly, so handle that case :
   702         if isinstance(date, basestring):
   702         if isinstance(date, basestring):
   703             try:
   703             try:
   704                 date = form.parse_datetime(date, 'Datetime')
   704                 date = form._cw.parse_datetime(date, 'Datetime')
   705             except ValueError, ex:
   705             except ValueError, ex:
   706                 raise ProcessFormError(unicode(ex))
   706                 raise ProcessFormError(unicode(ex))
   707         return date
   707         return date
   708 
   708 
   709 
   709 
   716         time = Field.process_form_value(self, form)
   716         time = Field.process_form_value(self, form)
   717         # but for some widgets, it might be simpler to return time objects
   717         # but for some widgets, it might be simpler to return time objects
   718         # directly, so handle that case :
   718         # directly, so handle that case :
   719         if isinstance(time, basestring):
   719         if isinstance(time, basestring):
   720             try:
   720             try:
   721                 time = form.parse_datetime(time, 'Time')
   721                 time = form._cw.parse_datetime(time, 'Time')
   722             except ValueError, ex:
   722             except ValueError, ex:
   723                 raise ProcessFormError(unicode(ex))
   723                 raise ProcessFormError(unicode(ex))
   724         return time
   724         return time
   725 
   725 
   726 
   726 
   792             return linkedto
   792             return linkedto
   793         # it isn't, check if the entity provides a method to get correct values
   793         # it isn't, check if the entity provides a method to get correct values
   794         vocab = relvoc_init(entity, self.name, self.role, self.required)
   794         vocab = relvoc_init(entity, self.name, self.role, self.required)
   795         method = '%s_%s_vocabulary' % (self.role, self.name)
   795         method = '%s_%s_vocabulary' % (self.role, self.name)
   796         try:
   796         try:
   797             vocab += getattr(form, method)(rtype, limit)
   797             vocab += getattr(form, method)(self.name, limit)
   798             warn('[3.6] found %s on %s, should override field.choices instead (need tweaks)'
   798             warn('[3.6] found %s on %s, should override field.choices instead (need tweaks)'
   799                  % (method, form), DeprecationWarning)
   799                  % (method, form), DeprecationWarning)
   800         except AttributeError:
   800         except AttributeError:
   801             vocab += relvoc_unrelated(entity, self.name, self.role, limit)
   801             vocab += relvoc_unrelated(entity, self.name, self.role, limit)
   802         if self.sort:
   802         if self.sort: