cubicweb: comparison web/form.py

equal deleted inserted replaced

-:ee560986e211
+:4fde01fc39ca
 from cubicweb.view import NOINDEX, NOFOLLOW, View, EntityView, AnyRsetView
 from cubicweb.common.registerers import accepts_registerer
 from cubicweb.web import stdmsgs
 from cubicweb.web.httpcache import NoHTTPCacheManager
 from cubicweb.web.controller import redirect_params
-from cubicweb.web import eid_param
+from cubicweb.web import INTERNAL_FIELD_VALUE, eid_param
 def relation_id(eid, rtype, target, reid):
 if target == 'subject':
 return u'%s:%s:%s' % (eid, rtype, reid)
 label = self.req._(label or stdmsgs.BUTTON_OK).capitalize()
 return self.BUTTON_STR % ('defaultsubmit', label, tabindex or 2)
 def button_apply(self, label=None, tabindex=None):
 label = self.req._(label or stdmsgs.BUTTON_APPLY).capitalize()
-return self.ACTION_SUBMIT_STR % ('__action_apply', label, self.domid, label, tabindex or 3)
+return self.ACTION_SUBMIT_STR % ('__action_apply', label, self.domid,
+label, tabindex or 3)
 def button_delete(self, label=None, tabindex=None):
 label = self.req._(label or stdmsgs.BUTTON_DELETE).capitalize()
-return self.ACTION_SUBMIT_STR % ('__action_delete', label, self.domid, label, tabindex or 3)
+return self.ACTION_SUBMIT_STR % ('__action_delete', label, self.domid,
+label, tabindex or 3)
 def button_cancel(self, label=None, tabindex=None):
 label = self.req._(label or stdmsgs.BUTTON_CANCEL).capitalize()
-return self.ACTION_SUBMIT_STR % ('__action_cancel', label, self.domid, label, tabindex or 4)
+return self.ACTION_SUBMIT_STR % ('__action_cancel', label, self.domid,
+label, tabindex or 4)
 def button_reset(self, label=None, tabindex=None):
 label = self.req._(label or stdmsgs.BUTTON_CANCEL).capitalize()
 return u'<input class="validateButton" type="reset" value="%s" tabindex="%s"/>' % (
 label, tabindex or 4)
 class DateField(IntField):
 def format_value(self, req, value):
 return value and ustrftime(value, req.property_value('ui.date-format')) or u''
-class DateTimeField(IntField):
+class HiddenInitialValueField(Field):
+def __init__(self, visible_field, name):
-def format_value(self, req, value):
+super(HiddenInitialValueField, self).__init__(name=name,
-return value and ustrftime(value, req.property_value('ui.datetime-format')) or u''
+widget=HiddenInput)
+self.visible_field = visible_field
-class FileField(IntField):
-needs_multipart = True
+class RelationField(Field):
+def __init__(self, role='subject', **kwargs):
+super(RelationField, self).__init__(**kwargs)
+self.role = role
 # forms ############
 class metafieldsform(type):
 def __new__(mcs, name, bases, classdict):
 allfields = []
 for base in bases:
 # on validation error, we get a dictionnary of previously submitted values
 previous_values = self.req.data.get('formvalues')
 if previous_values:
 values.update(previous_values)
 for field in self.fields:
-context[field] = {'value': self.form_field_value(field, field_values),
+context[field] = {'value': self.form_field_value(field, values),
 'name': self.form_field_name(field),
 'id': self.form_field_id(field),
 }
 def form_field_value(self, field, values):
 self.fields.append(TextField(name='__type', widget=HiddenInput))
 self.fields.append(TextField(name='eid', widget=HiddenInput))
 def form_render(self, entity, **values):
 self.entity = entity
+eschema = self.entity.e_schema
+for field in self.fields[:]:
+fieldname = field.name
+if fieldname != 'eid' and (
+(eschema.has_subject_relation(fieldname) or
+eschema.has_object_relation(fieldname))):
+self.fields.append(self.build_hidden_field(field))
 return super(EntityFieldsForm, self).form_render(**values)
+def build_hidden_field(self, field):
+"""returns the hidden field which will indicate the value
+before the modification
+"""
+# Only RelationField has a `role` attribute, others are used
+# to describe attribute fields => role is 'subject'
+role = getattr(field, 'role', 'subject')
+if role == 'subject':
+name = 'edits-%s' % field.name
+else:
+name = 'edito-%s' % field.name
+return HiddenInitialValueField(field, name=name)
 def form_field_value(self, field, values):
 """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 (including previously submitted
 form values if any)
 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':
+fieldname = field.name
+if fieldname.startswith('edits-') or fieldname.startswith('edito-'):
+value = self.form_field_value(field.visible_field, values)
+if value is None or not self.entity.has_eid():
+value = INTERNAL_FIELD_VALUE
+elif fieldname == '__type':
 value = self.entity.id
-elif field.name == 'eid':
+elif fieldname == 'eid':
 value = self.entity.eid
-elif field.name in values:
+elif fieldname in values:
-value = values[field.name]
+value = values[fieldname]
-elif field.name in self.req.form:
+elif fieldname in self.req.form:
-value = self.req.form[field.name]
+value = self.req.form[fieldname]
 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)
+value = getattr(self.entity, fieldname, field.initial)
 else:
-defaultattr = 'default_%s' % field.name
+defaultattr = 'default_%s' % fieldname
 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)
 w(u'</fieldset>')
 w(u'</form>')
 return '\n'.join(data)
 def render_fields(self, w, form):
+fields = form.fields[:]
+for field in form.fields:
+if isinstance(field.widget, HiddenInput):
+w(field.render(form))
+fields.remove(field)
 w(u'<table>')
-for field in form.fields:
+for field in fields:
 w(u'<tr>')
 w('<th>%s</th>' % self.render_label(form, field))
 w(u'<td style="width:100%;">')
 w(field.render(form))
 w(u'</td></tr>')

branch	tls-sprint
changeset 863	4fde01fc39ca
parent 849	8591d896db7e
child 864	e0947007542a