cubicweb: comparison web/views/editforms.py

equal deleted inserted replaced

-:56a235af050e
+:ec95eaa2b711
 from cubicweb.common import tags
 from cubicweb.web import INTERNAL_FIELD_VALUE, stdmsgs, eid_param
 from cubicweb.web.form import CompositeForm, EntityFieldsForm, FormViewMixIn
 from cubicweb.web.formfields import RelationField
 from cubicweb.web.formwidgets import Button, SubmitButton, ResetButton, Select
-from cubicweb.web.formrenderers import (FormRenderer, EntityFormRenderer,
+from cubicweb.web.views.formrenderers import FormRenderer
-EntityCompositeFormRenderer,
-EntityInlinedFormRenderer)
 def relation_id(eid, rtype, role, reid):
 """return an identifier for a relation between two entities"""
 if role == 'subject':
 value = html_escape(self.view(vid, rset, 'null') or default)
 if not entity.has_perm('update'):
 self.w(value)
 return
 if rschema.is_final():
-form = self._build_attribute_form(entity, value, rtype, role, reload, row, col, default)
+form = self._build_attribute_form(entity, value, rtype, role,
+reload, row, col, default)
 else:
-form = self._build_relation_form(entity, value, rtype, role, row, col, vid, default)
+form = self._build_relation_form(entity, value, rtype, role,
+row, col, vid, default)
 form.form_add_hidden(u'__maineid', entity.eid)
-renderer = FormRenderer(display_label=False, display_help=False,
+renderer = FormRenderer(self.req, display_label=False, display_help=False,
 display_fields=[(rtype, role)],
 table_class='', button_bar_class='buttonbar',
 display_progress_div=False)
 self.w(form.form_render(renderer=renderer))
 def _build_relation_form(self, entity, value, rtype, role, row, col, vid, default):
 entity = self.entity(row, col)
 divid = 'd%s' % make_uid('%s-%s' % (rtype, entity.eid))
 event_data = {'divid' : divid, 'eid' : entity.eid, 'rtype' : rtype, 'vid' : vid,
 'default' : default, 'role' : role}
-form = EntityFieldsForm(self.req, None, entity=entity, action='#',
+form = EntityFieldsForm(self.req, entity=entity, action='#',
 domid='%s-form' % divid,
 cssstyle='display: none',
 onsubmit=("return inlineValidateRelationForm('%(divid)s-form', '%(rtype)s', "
 "'%(role)s', '%(eid)s', '%(divid)s', '%(vid)s', '%(default)s');" %
 event_data),
 # add yes() so it takes precedence over deprecated views in baseforms,
 # though not baseforms based customized view
 __select__ = one_line_rset() & non_final_entity() & yes()
 title = _('edition')
-renderer = EntityFormRenderer()
 def cell_call(self, row, col, **kwargs):
 entity = self.complete_entity(row, col)
 self.render_form(entity)
 self.form_title(entity)
 form = self.vreg.select_object('forms', 'edition', self.req, entity.rset,
 row=entity.row, col=entity.col, entity=entity,
 submitmsg=self.submited_message())
 self.init_form(form, entity)
-self.w(form.form_render(renderer=self.renderer, formvid=u'edition'))
+self.w(form.form_render(formvid=u'edition'))
 def init_form(self, form, entity):
 """customize your form before rendering here"""
 form.form_add_hidden(u'__maineid', entity.eid)
 """a view to edit multiple entities of the same type the first column
 should be the eid
 """
 #self.form_title(entity)
 form = self.vreg.select_object('forms', self.id, self.req, self.rset)
-self.w(form.form_render(renderer=EntityCompositeFormRenderer()))
+self.w(form.form_render())
 class InlineEntityEditionFormView(FormViewMixIn, EntityView):
 id = 'inline-edition'
 __select__ = non_final_entity() & match_kwargs('peid', 'rtype')
 self.render_form(entity, peid, rtype, role, divonclick=divonclick)
 def render_form(self, entity, peid, rtype, role, **kwargs):
 """fetch and render the form"""
 form = self.vreg.select_object('forms', 'edition', self.req, None,
-entity=entity, set_error_url=False,
+entity=entity, form_renderer_id='inline',
+set_error_url=False,
 copy_nav_params=False)
 self.add_hiddens(form, entity, peid, rtype, role)
 divid = '%s-%s-%s' % (peid, rtype, entity.eid)
 title = self.schema.rschema(rtype).display_name(self.req, role)
 removejs = self.removejs % (peid, rtype,entity.eid)
-self.w(form.form_render(renderer=EntityInlinedFormRenderer(), divid=divid,
+self.w(form.form_render(divid=divid, title=title, removejs=removejs,
-title=title, removejs=removejs,**kwargs))
+**kwargs))
 def add_hiddens(self, form, entity, peid, rtype, role):
 # to ease overriding (see cubes.vcsfile.views.forms for instance)
 if self.keep_entity(form, entity, peid, rtype):
 if entity.has_eid():

changeset 1995	ec95eaa2b711
parent 1977	606923dff11b
child 2005	e8032965f37a