# HG changeset patch # User Adrien Di Mascio # Date 1235084757 -3600 # Node ID 90d98d80af82379519f69759ce9195f992c28627 # Parent 3d9df99b0bfaaa7ee5711a03ccc9f049d556422c EntityFieldsForm.form_render() doesn't need entity anymore diff -r 3d9df99b0bfa -r 90d98d80af82 web/form.py --- a/web/form.py Thu Feb 19 23:32:51 2009 +0100 +++ b/web/form.py Fri Feb 20 00:05:57 2009 +0100 @@ -407,7 +407,6 @@ def render(self, form): return self.widget.render(form, self) - class StringField(Field): def __init__(self, max_length=None, **kwargs): super(StringField, self).__init__(**kwargs) @@ -590,9 +589,8 @@ self.form_add_hidden('__type') self.form_add_hidden('eid', eidparam=False) - def form_render(self, entity, **values): - self.form_add_entity_hiddens(entity.e_schema) - self.entity = entity + def form_render(self, **values): + self.form_add_entity_hiddens(self.entity.e_schema) return super(EntityFieldsForm, self).form_render(**values) def form_add_entity_hiddens(self, eschema): diff -r 3d9df99b0bfa -r 90d98d80af82 web/views/baseforms.py --- a/web/views/baseforms.py Thu Feb 19 23:32:51 2009 +0100 +++ b/web/views/baseforms.py Fri Feb 20 00:05:57 2009 +0100 @@ -104,13 +104,13 @@ 'st1': _(state.name), 'st2': _(dest.name)} self.w(u'

%s

\n' % msg) - form = ChangeStateForm(redirect_path=self.redirectpath(entity)) # self.vreg.select_form('changestateform') - self.w(form.form_render(req, entity, state=dest.eid)) + form = ChangeStateForm(req, entity=entity, + redirect_path=self.redirectpath(entity)) + self.w(form.form_render(entity, state=dest.eid)) def redirectpath(self, entity): return entity.rest_path() - class ClickAndEditForm(FormMixIn, EntityView): id = 'reledit' __select__ = match_kwargs('rtype')