cubicweb: comparison web/form.py

equal deleted inserted replaced

-:27c4ebe90d03
+:f5aca5c5f6ca
 :copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
 """
 __docformat__ = "restructuredtext en"
+from warnings import warn
 from simplejson import dumps
 from logilab.common.compat import any
 from logilab.mtconverter import html_escape
 self.id = id or 'form'
 self.title = title
 self.action = action
 self.redirect_path = None
 self.fields = list(self.__class__._fields_)
+self.fields.append(TextField(name='__errorurl', widget=HiddenInput,
+initial=req.url()))
 self.context = {}
 @property
 def form_needs_multipart(self):
 return any(field.needs_multipart for field in self.fields)
 'name': self.form_field_name(field, values),
 'id': self.form_field_id(field, values),
 }
 def form_field_value(self, field, values):
-value = values.get(field.name, field.initial)
+"""looks for field's value in
+1. kw args given to render_form
+2. req.form
+3. field's initial value
+"""
+if field.name in values:
+value = values[field.name]
+elif field.name in self.req.form:
+value = self.req.form[field.name]
+else:
+value = field.initial
 return field.format_value(self.req, value)
 def form_field_name(self, field, values):
 return field.name
 def form_render(self, entity, **values):
 self.entity = entity
 return super(EntityFieldsForm, self).form_render(**values)
 def form_field_value(self, field, values):
-try:
+"""look for field's value with the following rules:
+1. handle special __type and eid fields
+2. looks in kw args given to render_form
+3. looks in req.form
+4. if entity has an eid:
+1. looks for an associated attribute / method
+2. use field's initial value
+else:
+1. looks for a default_<fieldname> attribute / method on the form
+2. use field's initial value
+values found in step 4 may be a callable which'll then be called.
+"""
+if field.name == '__type':
+value = self.entity.id
+elif field.name == 'eid':
+value = self.entity.eid
+elif field.name in values:
 value = values[field.name]
-except KeyError:
+elif field.name in self.req.form:
-value = getattr(self.entity, field.name, field.initial)
+value = self.req.form[field.name]
+else:
+if self.entity.has_eid():
+# use value found on the entity or field's initial value if it's
+# not an attribute of the entity (XXX may conflicts and get
+# undesired value)
+value = getattr(self.entity, field.name, field.initial)
+else:
+defaultattr = 'default_%s' % field.name
+if hasattr(self.entity, defaultattr):
+# XXX bw compat, default_<field name> on the entity
+warn('found %s on %s, should be set on a specific form'
+% (defaultattr, self.entity.id), DeprecationWarning)
+value = getattr(self.entity, defaultattr)
+elif hasattr(self, defaultattr):
+# search for default_<field name> on the form instance
+value = getattr(self, defaultattr)
+else:
+# use field's initial value
+value = field.initial
+if callable(value):
+values = value()
 return field.format_value(self.req, value)
 def form_field_name(self, field, values):
 if field.eidparam:
 return eid_param(field.name, self.entity.eid)

branch	tls-sprint
changeset 848	f5aca5c5f6ca
parent 847	27c4ebe90d03
child 849	8591d896db7e