[Checkins] SVN: five.megrok.z3cform/branches/based-on-megrok.z3cform.base/src/five/megrok/z3cform/ checkpoint

[Jean-Francois Roche]

Log message for revision 107010:
  checkpoint

Changed:
  U   five.megrok.z3cform/branches/based-on-megrok.z3cform.base/src/five/megrok/z3cform/__init__.py
  U   five.megrok.z3cform/branches/based-on-megrok.z3cform.base/src/five/megrok/z3cform/directive.py
  U   five.megrok.z3cform/branches/based-on-megrok.z3cform.base/src/five/megrok/z3cform/meta.py
  U   five.megrok.z3cform/branches/based-on-megrok.z3cform.base/src/five/megrok/z3cform/tests/formwithlayout/formwithlayout.py

-=-
Modified: five.megrok.z3cform/branches/based-on-megrok.z3cform.base/src/five/megrok/z3cform/__init__.py
===================================================================
--- five.megrok.z3cform/branches/based-on-megrok.z3cform.base/src/five/megrok/z3cform/__init__.py	2009-12-23 13:24:52 UTC (rev 107009)
+++ five.megrok.z3cform/branches/based-on-megrok.z3cform.base/src/five/megrok/z3cform/__init__.py	2009-12-23 14:03:02 UTC (rev 107010)
@@ -1,2 +1,2 @@
 from components import Form, AddForm, EditForm, DisplayForm
-from directive import wrapper
+from directive import formview

Modified: five.megrok.z3cform/branches/based-on-megrok.z3cform.base/src/five/megrok/z3cform/directive.py
===================================================================
--- five.megrok.z3cform/branches/based-on-megrok.z3cform.base/src/five/megrok/z3cform/directive.py	2009-12-23 13:24:52 UTC (rev 107009)
+++ five.megrok.z3cform/branches/based-on-megrok.z3cform.base/src/five/megrok/z3cform/directive.py	2009-12-23 14:03:02 UTC (rev 107010)
@@ -2,7 +2,7 @@
 import martian
 
 
-class wrapper(martian.Directive):
+class formview(martian.Directive):
     scope = martian.CLASS
     store = martian.ONCE
     validate = martian.validateClass

Modified: five.megrok.z3cform/branches/based-on-megrok.z3cform.base/src/five/megrok/z3cform/meta.py
===================================================================
--- five.megrok.z3cform/branches/based-on-megrok.z3cform.base/src/five/megrok/z3cform/meta.py	2009-12-23 13:24:52 UTC (rev 107009)
+++ five.megrok.z3cform/branches/based-on-megrok.z3cform.base/src/five/megrok/z3cform/meta.py	2009-12-23 14:03:02 UTC (rev 107010)
@@ -6,7 +6,7 @@
 from plone.z3cform.layout import wrap_form, FormWrapper
 from grokcore.view.meta.views import ViewGrokker, default_view_name
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
-from five.megrok.z3cform.directive import wrapper
+from five.megrok.z3cform.directive import formview
 import Acquisition
 
 
@@ -17,17 +17,18 @@
     martian.directive(grokcore.view.layer, default=IDefaultBrowserLayer)
     martian.directive(grokcore.component.name, get_default=default_view_name)
     martian.directive(grokcore.security.require, name='permission')
-    martian.directive(wrapper, default=FormWrapper, name='formwrapper')
+    martian.directive(formview, default=None, name='formwrapper')
 
     def execute(self, factory, config, context, layer, name, permission,
                 formwrapper, **kw):
-        if getattr(factory, 'wrap', False):
-            factory.__view_name__ = name
-            newfactory = wrap_form(factory, formwrapper)
-            newfactory.module_info = factory.module_info
-            factory = newfactory
-            factory.getPhysicalPath = Acquisition.Acquired
-            factory.render = factory.__call__
+        if formwrapper is None:
+            formwrapper = FormWrapper
+        factory.__view_name__ = name
+        newfactory = wrap_form(factory, formwrapper)
+        newfactory.module_info = factory.module_info
+        factory = newfactory
+        factory.getPhysicalPath = Acquisition.Acquired
+        factory.render = factory.__call__
 
         ViewSecurityGrokker.execute(self, factory, config, permission, **kw)
         ViewGrokker.execute(self, factory, config, context, layer, name, **kw)

Modified: five.megrok.z3cform/branches/based-on-megrok.z3cform.base/src/five/megrok/z3cform/tests/formwithlayout/formwithlayout.py
===================================================================
--- five.megrok.z3cform/branches/based-on-megrok.z3cform.base/src/five/megrok/z3cform/tests/formwithlayout/formwithlayout.py	2009-12-23 13:24:52 UTC (rev 107009)
+++ five.megrok.z3cform/branches/based-on-megrok.z3cform.base/src/five/megrok/z3cform/tests/formwithlayout/formwithlayout.py	2009-12-23 14:03:02 UTC (rev 107010)
@@ -70,7 +70,7 @@
 """
 import os
 from five import grok
-from five.megrok import z3cform
+from five import megrok
 from plone.z3cform.layout import FormWrapper
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from z3c.form import field
@@ -105,8 +105,8 @@
     index = ViewPageTemplateFile(path('layout.pt'), _prefix='')
 
 
-class Edit(z3cform.EditForm):
+class Edit(megrok.z3cform.EditForm):
+    grok.context(IMammoth)
+    megrok.z3cform.formview(MyCoolFormWrapper)
+
     fields = field.Fields(IMammoth)
-    grok.context(IMammoth)
-    z3cform.wrapper(MyCoolFormWrapper)
-    wrap = True