[Testbot] Plone 5.0 - Python 2.7 - Build # 4294 - Fixed! - 0 failure(s)

jenkins at plone.org jenkins at plone.org
Mon Feb 23 15:00:36 UTC 2015


-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 4294 - Fixed!
-------------------------------------------------------------------------------

http://jenkins.plone.org/job/plone-5.0-python-2.7/4294/


-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------

Repository: plone.app.z3cform
Branch: refs/heads/master
Date: 2015-02-23T15:32:18+01:00
Author: Johannes Raggam (thet) <raggam-nl at adm.at>
Commit: https://github.com/plone/plone.app.z3cform/commit/b61c812e8236fe8294a9059ff89ffce6a40e2a51

Revert "Use the more specific browser layer IPloneFormLayer for adapter registrations. This avoids double registration errors."

This reverts commit 850a18b393ab9a9388d985821401e2f9ddfb86b1.

Files changed:
M CHANGES.rst
M plone/app/z3cform/configure.zcml

diff --git a/CHANGES.rst b/CHANGES.rst
index ee96a10..8dc4647 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,10 +4,6 @@ Changelog
 1.1 (unreleased)
 ----------------
 
-- 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 3d8f096..c50e2a6 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="plone.app.z3cform.interfaces.IPloneFormLayer"
+      layer="z3c.form.interfaces.IFormLayer"
       class=".templates.RenderWidget"
       permission="zope.Public"
       />
   <browser:page
       name="ploneform-render-widget"
       for="zope.contentprovider.interfaces.IContentProvider"
-      layer="plone.app.z3cform.interfaces.IPloneFormLayer"
+      layer="z3c.form.interfaces.IFormLayer"
       class=".templates.RenderContentProvider"
       permission="zope.Public"
       />
   <browser:page
       name="ploneform-render-widget"
       for="z3c.form.interfaces.ISingleCheckBoxWidget"
-      layer="plone.app.z3cform.interfaces.IPloneFormLayer"
+      layer="z3c.form.interfaces.IFormLayer"
       class=".templates.RenderSingleCheckboxWidget"
       permission="zope.Public"
       />
@@ -59,21 +59,21 @@
       provides="z3c.form.interfaces.IFieldWidget"
       for="zope.schema.interfaces.IList
            zope.schema.interfaces.ITextLine
-           plone.app.z3cform.interfaces.IPloneFormLayer"
+           z3c.form.interfaces.IFormLayer"
       />
   <adapter
       factory="plone.z3cform.textlines.textlines.TextLinesFieldWidgetFactory"
       provides="z3c.form.interfaces.IFieldWidget"
       for="zope.schema.interfaces.ITuple
            zope.schema.interfaces.ITextLine
-           plone.app.z3cform.interfaces.IPloneFormLayer"
+           z3c.form.interfaces.IFormLayer"
       />
   <adapter
       factory="plone.z3cform.textlines.textlines.TextLinesFieldWidgetFactory"
       provides="z3c.form.interfaces.IFieldWidget"
       for="zope.schema.interfaces.IAbstractSet
            zope.schema.interfaces.ITextLine
-           plone.app.z3cform.interfaces.IPloneFormLayer"
+           z3c.form.interfaces.IFormLayer"
       />
 
   <adapter
@@ -81,21 +81,21 @@
       provides="z3c.form.interfaces.IFieldWidget"
       for="zope.schema.interfaces.IList
            zope.schema.interfaces.IASCIILine
-           plone.app.z3cform.interfaces.IPloneFormLayer"
+           z3c.form.interfaces.IFormLayer"
       />
   <adapter
       factory="plone.z3cform.textlines.textlines.TextLinesFieldWidgetFactory"
       provides="z3c.form.interfaces.IFieldWidget"
       for="zope.schema.interfaces.ITuple
            zope.schema.interfaces.IASCIILine
-           plone.app.z3cform.interfaces.IPloneFormLayer"
+           z3c.form.interfaces.IFormLayer"
       />
   <adapter
       factory="plone.z3cform.textlines.textlines.TextLinesFieldWidgetFactory"
       provides="z3c.form.interfaces.IFieldWidget"
       for="zope.schema.interfaces.IAbstractSet
            zope.schema.interfaces.IASCIILine
-           plone.app.z3cform.interfaces.IPloneFormLayer"
+           z3c.form.interfaces.IFormLayer"
       />
 
   <adapter
@@ -158,7 +158,7 @@
   <adapter
       factory=".widget.DateFieldWidget"
       for=".interfaces.IDateField
-           plone.app.z3cform.interfaces.IPloneFormLayer" />
+           z3c.form.interfaces.IFormLayer" />
 
   <class class=".widget.DatetimeWidget">
     <require permission="zope.Public"
@@ -170,28 +170,28 @@
 
   <adapter factory=".widget.DatetimeFieldWidget"
            for=".interfaces.IDatetimeField
-                plone.app.z3cform.interfaces.IPloneFormLayer" />
+                z3c.form.interfaces.IFormLayer" />
 
   <adapter factory=".widget.RelatedItemsFieldWidget"
            for="z3c.relationfield.interfaces.IRelationChoice
-                plone.app.z3cform.interfaces.IPloneFormLayer" />
+                z3c.form.interfaces.IFormLayer" />
 
   <adapter factory=".widget.RelatedItemsFieldWidget"
            for="z3c.relationfield.interfaces.IRelationList
-                plone.app.z3cform.interfaces.IPloneFormLayer" />
+                z3c.form.interfaces.IFormLayer" />
 
   <adapter factory=".widget.RelatedItemsFieldWidget"
            for="zope.schema.interfaces.IChoice
                 plone.app.vocabularies.catalog.CatalogSource
-                plone.app.z3cform.interfaces.IPloneFormLayer" />
+                z3c.form.interfaces.IFormLayer" />
 
   <adapter factory=".widget.QueryStringFieldWidget"
            for="zope.schema.interfaces.IList
                 zope.schema.interfaces.IDict
-                plone.app.z3cform.interfaces.IPloneFormLayer"/>
+                z3c.form.interfaces.IFormLayer"/>
 
   <adapter factory=".widget.RichTextFieldWidget"
            for="plone.app.textfield.interfaces.IRichText
-                plone.app.z3cform.interfaces.IPloneFormLayer"/>
+                z3c.form.interfaces.IFormLayer"/>
 
 </configure>




-------------------------------------------------------------------------------


More information about the Testbot mailing list