[Checkins] SVN: megrok.z3cform.base/trunk/src/megrok/z3cform/base/ Let it work with a new version of grokcore.view
Christian Klinger
cklinger at novareto.de
Thu Sep 17 13:22:52 EDT 2009
Log message for revision 104252:
Let it work with a new version of grokcore.view
Changed:
U megrok.z3cform.base/trunk/src/megrok/z3cform/base/components.py
U megrok.z3cform.base/trunk/src/megrok/z3cform/base/meta.py
U megrok.z3cform.base/trunk/src/megrok/z3cform/base/tests/test_field.py
-=-
Modified: megrok.z3cform.base/trunk/src/megrok/z3cform/base/components.py
===================================================================
--- megrok.z3cform.base/trunk/src/megrok/z3cform/base/components.py 2009-09-17 17:17:20 UTC (rev 104251)
+++ megrok.z3cform.base/trunk/src/megrok/z3cform/base/components.py 2009-09-17 17:22:52 UTC (rev 104252)
@@ -60,7 +60,7 @@
return super(GrokForm, self)._render_template()
return self.template(self)
- def render(self):
+ def renderForm(self):
"""People don't have to define a render method here, and we
have to use the one provided by z3c.form (people can provide
render method in grok), but we have to call the template
@@ -72,9 +72,6 @@
return self._render_template()
- render.base_method = True # Mark the method to prevent people to
- # override it.
-
def __call__(self):
mapply(self.update, (), self.request)
if self.request.response.getStatus() in (302, 303):
@@ -127,6 +124,7 @@
grok.baseclass()
+
class DisplayForm(GrokForm, form.DisplayForm, grok.View):
"""z3c display form.
"""
Modified: megrok.z3cform.base/trunk/src/megrok/z3cform/base/meta.py
===================================================================
--- megrok.z3cform.base/trunk/src/megrok/z3cform/base/meta.py 2009-09-17 17:17:20 UTC (rev 104251)
+++ megrok.z3cform.base/trunk/src/megrok/z3cform/base/meta.py 2009-09-17 17:22:52 UTC (rev 104252)
@@ -44,13 +44,6 @@
if isinstance(form.fields, components.DefaultFields):
form.fields = get_auto_fields(context)
- # Don't override render method.
- if not getattr(form.render, 'base_method', False):
- raise GrokError(
- "It is not allowed to specify a custom 'render' "
- "method for form %r. Forms either use the default "
- "template or a custom-supplied one." % form,
- form)
return True
Modified: megrok.z3cform.base/trunk/src/megrok/z3cform/base/tests/test_field.py
===================================================================
--- megrok.z3cform.base/trunk/src/megrok/z3cform/base/tests/test_field.py 2009-09-17 17:17:20 UTC (rev 104251)
+++ megrok.z3cform.base/trunk/src/megrok/z3cform/base/tests/test_field.py 2009-09-17 17:22:52 UTC (rev 104252)
@@ -46,9 +46,8 @@
class Edit(EditForm):
- pass
+ pass
-
class Index(DisplayForm):
fields = field.Fields(IMammoth).omit('age')
More information about the checkins
mailing list