cubicweb: comparison web/views/forms.py

equal deleted inserted replaced

-:1bb43e31032d
+:a14b6562082b
 __docformat__ = "restructuredtext en"
 from warnings import warn
 from logilab.common import dictattr, tempattr
-from logilab.common.decorators import iclassmethod
+from logilab.common.decorators import iclassmethod, cached
 from logilab.common.compat import any
 from logilab.common.textutils import splitstrip
 from logilab.common.deprecation import deprecated
 from cubicweb import ValidationError, typed_eid
 from cubicweb.utils import support_args
 from cubicweb.selectors import non_final_entity, match_kwargs, one_line_rset
 from cubicweb.web import RequestError, ProcessFormError
 from cubicweb.web import uicfg, form, formwidgets as fwdgs
-from cubicweb.web.formfields import relvoc_unrelated, guess_field
+from cubicweb.web.formfields import guess_field
 class FieldsForm(form.Form):
 """This is the base class for fields based forms.
 if self.needs_js:
 self._cw.add_js(self.needs_js)
 if self.needs_css:
 self._cw.add_css(self.needs_css)
-def render(self, formvalues=None, rendervalues=None, renderer=None, **kwargs):
+def render(self, formvalues=None, renderer=None, **kwargs):
 """Render this form, using the `renderer` given as argument or the
 default according to :attr:`form_renderer_id`. The rendered form is
 returned as an unicode string.
 `formvalues` is an optional dictionary containing values that will be
 considered as field's value.
 Extra keyword arguments will be given to renderer's :meth:`render` method.
+"""
-`rendervalues` is deprecated.
-"""
-if rendervalues is not None:
-warn('[3.6] rendervalues argument is deprecated, all named arguments will be given instead',
-DeprecationWarning, stacklevel=2)
-kwargs = rendervalues
 w = kwargs.pop('w', None)
 if w is None:
 warn('[3.10] you should specify "w" to form.render() named arguments',
 DeprecationWarning, stacklevel=2)
 data = []
 if errors:
 errors = dict((f.role_name(), unicode(ex)) for f, ex in errors)
 raise ValidationError(None, errors)
 return processed
-@deprecated('[3.6] use .add_hidden(name, value, **kwargs)')
-def form_add_hidden(self, name, value=None, **kwargs):
-return self.add_hidden(name, value, **kwargs)
-@deprecated('[3.6] use .render(formvalues, **rendervalues)')
-def form_render(self, **values):
-"""render this form, using the renderer given in args or the default
-FormRenderer()
-"""
-self.build_context(values)
-renderer = values.pop('renderer', None)
-if renderer is None:
-renderer = self.default_renderer()
-return renderer.render(self, values)
 _AFF = uicfg.autoform_field
 _AFF_KWARGS = uicfg.autoform_field_kwargs
 class EntityFieldsForm(FieldsForm):
 self.add_hidden('eid', self.edited_entity.eid)
 # mainform default to true in parent, hence default to True
 if kwargs.get('mainform', True) or kwargs.get('mainentity', False):
 self.add_hidden(u'__maineid', self.edited_entity.eid)
 # If we need to directly attach the new object to another one
-if self._cw.list_form_param('__linkto'):
+if '__linkto' in self._cw.form:
-for linkto in self._cw.list_form_param('__linkto'):
-self.add_hidden('__linkto', linkto)
 if msg:
 msg = '%s %s' % (msg, self._cw._('and linked'))
 else:
 msg = self._cw._('entity linked')
 if msg:
 msgid = self._cw.set_redirect_message(msg)
 self.add_hidden('_cwmsgid', msgid)
+def add_linkto_hidden(self):
+"""add the __linkto hidden field used to directly attach the new object
+to an existing other one when the relation between those two is not
+already present in the form.
+Warning: this method must be called only when all form fields are setup
+"""
+for (rtype, role), eids in self.linked_to.iteritems():
+# if the relation is already setup by a form field, do not add it
+# in a __linkto hidden to avoid setting it twice in the controller
+try:
+self.field_by_name(rtype, role)
+except form.FieldNotFound:
+for eid in eids:
+self.add_hidden('__linkto', '%s:%s:%s' % (rtype, eid, role))
+def render(self, *args, **kwargs):
+self.add_linkto_hidden()
+return super(EntityFieldsForm, self).render(*args, **kwargs)
+@property
+@cached
+def linked_to(self):
+# if current form is not the main form, exit immediately
+try:
+self.field_by_name('__maineid')
+except form.FieldNotFound:
+return {}
+linked_to = {}
+for linkto in self._cw.list_form_param('__linkto'):
+ltrtype, eid, ltrole = linkto.split(':')
+linked_to.setdefault((ltrtype, ltrole), []).append(typed_eid(eid))
+return linked_to
 def session_key(self):
 """return the key that may be used to store / retreive data about a
 previous post which failed because of a validation error
 """
 return None
 def editable_relations(self):
 return ()
-@deprecated('[3.6] use cw.web.formfields.relvoc_unrelated function')
-def subject_relation_vocabulary(self, rtype, limit=None):
-"""defaut vocabulary method for the given relation, looking for
-relation's object entities (i.e. self is the subject)
-"""
-return relvoc_unrelated(self.edited_entity, rtype, 'subject', limit=None)
-@deprecated('[3.6] use cw.web.formfields.relvoc_unrelated function')
-def object_relation_vocabulary(self, rtype, limit=None):
-return relvoc_unrelated(self.edited_entity, rtype, 'object', limit=None)
 class CompositeFormMixIn(object):
 __regid__ = 'composite'
 form_renderer_id = __regid__

branch	oldstable
changeset 8462	a14b6562082b
parent 7990	a673d1d9a738
child 8128	0a927fe4541b