Fixed conflict with plone.app.multilingual[dexterity]

quintagroup · Jun 6, 2014 · 0cb0626 · 0cb0626
1 parent 1066e0c
commit 0cb0626
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 6 deletions.
diff --git a/collective/easyform/browser/actions.py b/collective/easyform/browser/actions.py
@@ -13,7 +13,6 @@
 from plone.schemaeditor.browser.schema.listing import SchemaListingPage
 from plone.schemaeditor.browser.schema.traversal import SchemaContext
 from plone.schemaeditor.interfaces import IFieldEditFormSchema
-from plone.schemaeditor.interfaces import IFieldEditorExtender
 from plone.schemaeditor.utils import SchemaModifiedEvent
 from plone.z3cform import layout
 from plone.z3cform.crud import crud
@@ -48,9 +47,10 @@
 from collective.easyform.browser.fields import AjaxSaveHandler
 from collective.easyform.interfaces import IActionEditForm
 from collective.easyform.interfaces import IActionFactory
-from collective.easyform.interfaces import IExtraData
 from collective.easyform.interfaces import IEasyFormActionContext
 from collective.easyform.interfaces import IEasyFormActionsContext
+from collective.easyform.interfaces import IEasyFormActionsEditorExtender
+from collective.easyform.interfaces import IExtraData
 from collective.easyform.interfaces import INewAction
 from collective.easyform.interfaces import ISaveData
 from collective.easyform.interfaces import ISavedDataFormWrapper
@@ -275,7 +275,7 @@ def schema(self):
     @lazy_property
     def additionalSchemata(self):
         schema_context = self.context.aq_parent
-        return [v for k, v in getAdapters((schema_context, self.field), IFieldEditorExtender)]
+        return [v for k, v in getAdapters((schema_context, self.field), IEasyFormActionsEditorExtender)]
 
     @button.buttonAndHandler(PMF(u'Save'), name='save')
     def handleSave(self, action):

diff --git a/collective/easyform/browser/fields.py b/collective/easyform/browser/fields.py
@@ -7,13 +7,17 @@
 from json import dumps
 from lxml import etree
 from plone.schemaeditor import SchemaEditorMessageFactory as __
+from plone.schemaeditor.browser.field.edit import EditView
+from plone.schemaeditor.browser.field.edit import FieldEditForm
 from plone.schemaeditor.browser.field.traversal import FieldContext
 from plone.schemaeditor.browser.schema.listing import SchemaListing
 from plone.schemaeditor.browser.schema.listing import SchemaListingPage
 from plone.schemaeditor.browser.schema.traversal import SchemaContext
 from plone.supermodel import loadString
 from plone.supermodel.parser import SupermodelParseError
 from z3c.form import button
+from zope.cachedescriptors.property import Lazy as lazy_property
+from zope.component import getAdapters
 from zope.component import queryMultiAdapter
 from zope.interface import implements
 
@@ -28,6 +32,7 @@
 from collective.easyform.api import get_fields
 from collective.easyform.interfaces import IEasyFormFieldContext
 from collective.easyform.interfaces import IEasyFormFieldsContext
+from collective.easyform.interfaces import IEasyFormFieldsEditorExtender
 
 
 class EasyFormFieldContext(FieldContext):
@@ -94,6 +99,18 @@ class EasyFormFieldsListingPage(SchemaListingPage):
     index = ViewPageTemplateFile('model_listing.pt')
 
 
+class FieldEditForm(FieldEditForm):
+
+    @lazy_property
+    def additionalSchemata(self):
+        schema_context = self.context.aq_parent
+        return [v for k, v in getAdapters((schema_context, self.field), IEasyFormFieldsEditorExtender)]
+
+
+class EditView(EditView):
+    form = FieldEditForm
+
+
 class ModelEditorView(BrowserView):
 
     """ editor view """

diff --git a/collective/easyform/browser/fields.zcml b/collective/easyform/browser/fields.zcml
@@ -30,7 +30,7 @@
     <browser:page
         name="edit"
         for="collective.easyform.interfaces.IEasyFormFieldContext"
-        class="plone.schemaeditor.browser.field.edit.EditView"
+        class=".fields.EditView"
         permission="cmf.ModifyPortalContent"
         />
     <browser:page

diff --git a/collective/easyform/exportimport.zcml b/collective/easyform/exportimport.zcml
@@ -2,7 +2,7 @@
            i18n_domain="collective.easyform">
     <adapter
         factory=".exportimport.get_field_extender"
-        provides="plone.schemaeditor.interfaces.IFieldEditorExtender"
+        provides="collective.easyform.interfaces.IEasyFormFieldsEditorExtender"
         name="collective.easyform.fieldextender"
         />
     <adapter
@@ -15,7 +15,7 @@
         />
     <adapter
         factory=".exportimport.get_action_extender"
-        provides="plone.schemaeditor.interfaces.IFieldEditorExtender"
+        provides="collective.easyform.interfaces.IEasyFormActionsEditorExtender"
         name="collective.easyform.actionextender"
         />
     <adapter

diff --git a/collective/easyform/interfaces.py b/collective/easyform/interfaces.py
@@ -6,6 +6,7 @@
 from plone.schemaeditor import SchemaEditorMessageFactory as __
 from plone.schemaeditor.interfaces import ID_RE
 from plone.schemaeditor.interfaces import IFieldContext
+from plone.schemaeditor.interfaces import IFieldEditorExtender
 from plone.schemaeditor.interfaces import ISchemaContext
 from plone.z3cform.interfaces import IFormWrapper
 from z3c.form.browser.checkbox import CheckBoxFieldWidget
@@ -74,6 +75,14 @@ class ISavedDataFormWrapper(IFormWrapper):
     pass
 
 
+class IEasyFormFieldsEditorExtender(IFieldEditorExtender):
+    pass
+
+
+class IEasyFormActionsEditorExtender(IFieldEditorExtender):
+    pass
+
+
 class INewAction(Interface):
 
     title = TextLine(