From 752cd16f03d55d9346e56255a4126860c2a43731 Mon Sep 17 00:00:00 2001
From: Johannes Raggam <raggam-nl@adm.at>
Date: Mon, 23 Mar 2015 11:54:26 +0100
Subject: [PATCH] Revert "Revert "Use the more specific browser layer
 IPloneFormLayer for adapter registrations. This avoids double registration
 errors.""

This reverts commit b61c812e8236fe8294a9059ff89ffce6a40e2a51.
---
 CHANGES.rst                      |  4 ++++
 plone/app/z3cform/configure.zcml | 32 ++++++++++++++++----------------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index a1b148eb..e84c3e12 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,6 +10,10 @@ Changelog
 1.1.0 (2015-03-21)
 ------------------
 
+- Use the more specific browser layer ``IPloneFormLayer`` for adapter
+  registrations. This avoids double registration errors.
+  [thet]
+
 - Integrate plone.app.widgets.
   [vangheem]
 
diff --git a/plone/app/z3cform/configure.zcml b/plone/app/z3cform/configure.zcml
index c50e2a60..3d8f0969 100644
--- a/plone/app/z3cform/configure.zcml
+++ b/plone/app/z3cform/configure.zcml
@@ -28,21 +28,21 @@
   <browser:page
       name="ploneform-render-widget"
       for="z3c.form.interfaces.IWidget"
-      layer="z3c.form.interfaces.IFormLayer"
+      layer="plone.app.z3cform.interfaces.IPloneFormLayer"
       class=".templates.RenderWidget"
       permission="zope.Public"
       />
   <browser:page
       name="ploneform-render-widget"
       for="zope.contentprovider.interfaces.IContentProvider"
-      layer="z3c.form.interfaces.IFormLayer"
+      layer="plone.app.z3cform.interfaces.IPloneFormLayer"
       class=".templates.RenderContentProvider"
       permission="zope.Public"
       />
   <browser:page
       name="ploneform-render-widget"
       for="z3c.form.interfaces.ISingleCheckBoxWidget"
-      layer="z3c.form.interfaces.IFormLayer"
+      layer="plone.app.z3cform.interfaces.IPloneFormLayer"
       class=".templates.RenderSingleCheckboxWidget"
       permission="zope.Public"
       />
@@ -59,21 +59,21 @@
       provides="z3c.form.interfaces.IFieldWidget"
       for="zope.schema.interfaces.IList
            zope.schema.interfaces.ITextLine
-           z3c.form.interfaces.IFormLayer"
+           plone.app.z3cform.interfaces.IPloneFormLayer"
       />
   <adapter
       factory="plone.z3cform.textlines.textlines.TextLinesFieldWidgetFactory"
       provides="z3c.form.interfaces.IFieldWidget"
       for="zope.schema.interfaces.ITuple
            zope.schema.interfaces.ITextLine
-           z3c.form.interfaces.IFormLayer"
+           plone.app.z3cform.interfaces.IPloneFormLayer"
       />
   <adapter
       factory="plone.z3cform.textlines.textlines.TextLinesFieldWidgetFactory"
       provides="z3c.form.interfaces.IFieldWidget"
       for="zope.schema.interfaces.IAbstractSet
            zope.schema.interfaces.ITextLine
-           z3c.form.interfaces.IFormLayer"
+           plone.app.z3cform.interfaces.IPloneFormLayer"
       />
 
   <adapter
@@ -81,21 +81,21 @@
       provides="z3c.form.interfaces.IFieldWidget"
       for="zope.schema.interfaces.IList
            zope.schema.interfaces.IASCIILine
-           z3c.form.interfaces.IFormLayer"
+           plone.app.z3cform.interfaces.IPloneFormLayer"
       />
   <adapter
       factory="plone.z3cform.textlines.textlines.TextLinesFieldWidgetFactory"
       provides="z3c.form.interfaces.IFieldWidget"
       for="zope.schema.interfaces.ITuple
            zope.schema.interfaces.IASCIILine
-           z3c.form.interfaces.IFormLayer"
+           plone.app.z3cform.interfaces.IPloneFormLayer"
       />
   <adapter
       factory="plone.z3cform.textlines.textlines.TextLinesFieldWidgetFactory"
       provides="z3c.form.interfaces.IFieldWidget"
       for="zope.schema.interfaces.IAbstractSet
            zope.schema.interfaces.IASCIILine
-           z3c.form.interfaces.IFormLayer"
+           plone.app.z3cform.interfaces.IPloneFormLayer"
       />
 
   <adapter
@@ -158,7 +158,7 @@
   <adapter
       factory=".widget.DateFieldWidget"
       for=".interfaces.IDateField
-           z3c.form.interfaces.IFormLayer" />
+           plone.app.z3cform.interfaces.IPloneFormLayer" />
 
   <class class=".widget.DatetimeWidget">
     <require permission="zope.Public"
@@ -170,28 +170,28 @@
 
   <adapter factory=".widget.DatetimeFieldWidget"
            for=".interfaces.IDatetimeField
-                z3c.form.interfaces.IFormLayer" />
+                plone.app.z3cform.interfaces.IPloneFormLayer" />
 
   <adapter factory=".widget.RelatedItemsFieldWidget"
            for="z3c.relationfield.interfaces.IRelationChoice
-                z3c.form.interfaces.IFormLayer" />
+                plone.app.z3cform.interfaces.IPloneFormLayer" />
 
   <adapter factory=".widget.RelatedItemsFieldWidget"
            for="z3c.relationfield.interfaces.IRelationList
-                z3c.form.interfaces.IFormLayer" />
+                plone.app.z3cform.interfaces.IPloneFormLayer" />
 
   <adapter factory=".widget.RelatedItemsFieldWidget"
            for="zope.schema.interfaces.IChoice
                 plone.app.vocabularies.catalog.CatalogSource
-                z3c.form.interfaces.IFormLayer" />
+                plone.app.z3cform.interfaces.IPloneFormLayer" />
 
   <adapter factory=".widget.QueryStringFieldWidget"
            for="zope.schema.interfaces.IList
                 zope.schema.interfaces.IDict
-                z3c.form.interfaces.IFormLayer"/>
+                plone.app.z3cform.interfaces.IPloneFormLayer"/>
 
   <adapter factory=".widget.RichTextFieldWidget"
            for="plone.app.textfield.interfaces.IRichText
-                z3c.form.interfaces.IFormLayer"/>
+                plone.app.z3cform.interfaces.IPloneFormLayer"/>
 
 </configure>