cubicweb: comparison web/views/editforms.py

equal deleted inserted replaced

-:92ead039d3d0
+:94cc7cad3d2d
 from cubicweb.web.form import FormViewMixIn, FieldNotFound
 from cubicweb.web.formfields import guess_field
 from cubicweb.web.formwidgets import Button, SubmitButton, ResetButton
 from cubicweb.web.views import forms
+_pvdc = uicfg.primaryview_display_ctrl
 def relation_id(eid, rtype, role, reid):
 """return an identifier for a relation between two entities"""
 if role == 'subject':
 return u'%s:%s:%s' % (eid, rtype, reid)
 # don't use outofcontext view or any other that may contain inline
 # edition form
 w(u'<li>%s</li>' % tags.a(entity.view('textoutofcontext'),
 href=entity.absolute_url()))
 w(u'</ul>\n')
-w(form.form_render())
+w(form.render())
 class ClickAndEditFormView(FormViewMixIn, EntityView):
 """form used to permit ajax edition of a relation or attribute of an entity
 in a view, if logged user have the permission to edit it.
 return
 value = entity.printable_value(rtype) or default
 self.relation_form(lzone, value, form,
 self._build_renderer(entity, rtype, role))
 else:
-if rvid is None:
+rvid = self._compute_best_vid(entity.e_schema, rschema, role)
-rvid = self._compute_best_vid(entity.e_schema, rschema, role)
 rset = entity.related(rtype, role)
 if rset:
 value = self._cw.view(rvid, rset)
 else:
 value = default
 w(u'<div id="%s-reledit" class="field" '
 u'onmouseout="addElementClass(jQuery(\'#%s\'), \'hidden\')" '
 u'onmouseover="removeElementClass(jQuery(\'#%s\'), \'hidden\')">'
 % (divid, divid, divid))
 w(u'<div id="%s-value" class="editableFieldValue">%s</div>' % (divid, value))
-w(form.form_render(renderer=renderer))
+w(form.render(renderer=renderer))
 w(u'<div id="%s" class="editableField hidden" onclick="%s" title="%s">' % (
 divid, xml_escape(self._onclick % form.event_args),
 self.req._(self._landingzonemsg)))
 w(lzone)
 w(u'</div>')
 w(u'</div>')
 def _compute_best_vid(self, eschema, rschema, role):
+dispctrl = _pvdc.etype_get(eschema, rschema, role)
+if dispctrl.get('rvid'):
+return dispctrl['rvid']
 if eschema.cardinality(rschema, role) in '+*':
 return self._many_rvid
 return self._one_rvid
 def _build_landing_zone(self, lzone):
 class DummyForm(object):
 __slots__ = ('event_args',)
 def form_render(self, **_args):
 return u''
+def render(self, **_args):
+return u''
 def append_field(self, *args):
 pass
 class AutoClickAndEditFormView(ClickAndEditFormView):
 """same as ClickAndEditFormView but checking if the view *should* be applied
 def should_edit_relation(self, entity, rschema, role, rvid):
 eschema = entity.e_schema
 rtype = str(rschema)
 # XXX check autoform_section. what if 'generic'?
-dispctrl = uicfg.primaryview_display_ctrl.etype_get(eschema, rtype, role)
+dispctrl = _pvdc.etype_get(eschema, rtype, role)
 vid = dispctrl.get('vid', 'reledit')
 if vid != 'reledit': # reledit explicitly disabled
 return False
 if eschema.role_rproperty(role, rschema, 'composite') == role:
 return False
 form = self._cw.vreg['forms'].select('edition', self._cw, rset=entity.cw_rset,
 row=entity.cw_row, col=entity.cw_col,
 entity=entity,
 submitmsg=self.submited_message())
 self.init_form(form, entity)
-self.w(form.form_render(formvid=u'edition'))
+self.w(form.render(rendervalues=dict(formvid=u'edition')))
 def init_form(self, form, entity):
 """customize your form before rendering here"""
 pass
 """
 #self.form_title(entity)
 form = self._cw.vreg['forms'].select(self.__regid__, self._cw,
 rset=self.cw_rset,
 copy_nav_params=True)
-self.w(form.form_render())
+self.w(form.render())
 class InlineEntityEditionFormView(FormViewMixIn, EntityView):
 """
 :attr peid: the parent entity's eid hosting the inline form
 def form(self):
 entity = self._entity()
 form = self.vreg['forms'].select('edition', self._cw,
 entity=entity,
 form_renderer_id='inline',
-mainform=False, copy_nav_params=False,
+copy_nav_params=False,
+mainform=False,
+parent_form=self.pform,
 **self.extra_kwargs)
-form.parent_form = self.pform
+if self.pform is None:
+form.restore_previous_post(form.session_key())
+#assert form.parent_form
 self.add_hiddens(form, entity)
 return form
 def cell_call(self, row, col, i18nctx, **kwargs):
 """
 def render_form(self, i18nctx, **kwargs):
 """fetch and render the form"""
 entity = self._entity()
 divid = '%s-%s-%s' % (self.peid, self.rtype, entity.eid)
-title = self.req.pgettext(i18nctx, 'This %s' % entity.e_schema)
+title = self.form_title(entity, i18nctx)
-removejs = self.removejs % (self.peid, self.rtype, entity.eid)
+removejs = self.removejs and self.removejs % (
+self.peid, self.rtype, entity.eid)
 countkey = '%s_count' % self.rtype
 try:
 self._cw.data[countkey] += 1
-except:
+except KeyError:
 self._cw.data[countkey] = 1
-self.w(self.form.form_render(
+self.w(self.form.form.render(
 divid=divid, title=title, removejs=removejs, i18nctx=i18nctx,
 counter=self.req.data[countkey], **kwargs))
+self.w(self.form.render(
+rendervalues=dict(divid=divid, title=title, removejs=removejs,
+i18nctx=i18nctx, counter=self._cw.data[countkey]),
+formvalues=kwargs))
+def form_title(self, entity, i18nctx):
+return self.req.pgettext(i18nctx, 'This %s' % entity.e_schema)
 def add_hiddens(self, form, entity):
 """to ease overriding (see cubes.vcsfile.views.forms for instance)"""
 iid = 'rel-%s-%s-%s' % (self.peid, self.rtype, entity.eid)
 #  * str(self.rtype) in case it's a schema object
 """
 __regid__ = 'inline-creation'
 __select__ = (match_kwargs('peid', 'rtype')
 & specified_etype_implements('Any'))
 _select_attrs = InlineEntityEditionFormView._select_attrs + ('etype',)
-removejs = "removeInlineForm('%s', '%s', '%s')"
+@property
+def removejs(self):
+entity = self._entity()
+card = entity.e_schema.role_rproperty(neg_role(self.role), self.rtype, 'cardinality')
+card = card[self.role == 'object']
+# when one is adding an inline entity for a relation of a single card,
+# the 'add a new xxx' link disappears. If the user then cancel the addition,
+# we have to make this link appears back. This is done by giving add new link
+# id to removeInlineForm.
+if card not in '?1':
+return "removeInlineForm('%s', '%s', '%s')"
+divid = "addNew%s%s%s:%s" % (self.etype, self.rtype, self.role, self.peid)
+return "removeInlineForm('%%s', '%%s', '%%s', '%s')" % divid
 @cached
 def _entity(self):
 try:
 cls = self._cw.vreg['etypes'].etype_class(self.etype)

changeset 3998	94cc7cad3d2d
parent 3890	d7a270f50f54
parent 3953	19aefd78f61b
child 4007	91d11fda4aa0