[fc] Repository: plone.app.z3cform

Branch: refs/heads/master Date: 2015-03-23T11:54:26+01:00 Author: Johannes Raggam (thet) <raggam-nl@adm.at> Commit: plone/plone.app.z3cform@752cd16 Revert "Revert "Use the more specific browser layer IPloneFormLayer for adapter registrations. This avoids double registration errors."" This reverts commit b61c812e8236fe8294a9059ff89ffce6a40e2a51. Files changed: M CHANGES.rst M plone/app/z3cform/configure.zcml Repository: plone.app.z3cform Branch: refs/heads/master Date: 2015-03-24T01:44:10+01:00 Author: Johannes Raggam (thet) <raggam-nl@adm.at> Commit: plone/plone.app.z3cform@608f973 Merge pull request #18 from plone/thet-iploneformlayer use more specific form layer Files changed: M CHANGES.rst M plone/app/z3cform/configure.zcml
plone · Mar 24, 2015 · 4391790 · 4391790
1 parent 3abbdff
commit 4391790
Showing 1 changed file with 297 additions and 29 deletions.
diff --git a/last_commit.txt b/last_commit.txt
@@ -1,40 +1,308 @@
-Repository: Products.Archetypes
+Repository: plone.app.z3cform
 Branch: refs/heads/master
-Date: 2015-03-24T00:27:07+01:00
+Date: 2015-03-23T11:54:26+01:00
 Author: Johannes Raggam (thet) <raggam-nl@adm.at>
-Commit: https://github.com/plone/Products.Archetypes/commit/82e660523d4de2f1628378b31c397509fe54c4f0
+Commit: https://github.com/plone/plone.app.z3cform/commit/752cd16f03d55d9346e56255a4126860c2a43731
 
-Replace deprecated JavaScript functions with their jQuery equivalents.
+Revert "Revert "Use the more specific browser layer IPloneFormLayer for adapter registrations. This avoids double registration errors.""
+
+This reverts commit b61c812e8236fe8294a9059ff89ffce6a40e2a51.
 
 Files changed:
-M CHANGES.txt
-M Products/Archetypes/skins/archetypes/reference_focus_js.dtml
-
-diff --git a/CHANGES.txt b/CHANGES.txt
-index 1adcb9a..ecca50e 100644
---- a/CHANGES.txt
-+++ b/CHANGES.txt
-@@ -4,7 +4,8 @@ Changelog
- 1.10.6 (unreleased)
- -------------------
-
--- Nothing changed yet.
-+- Replace deprecated JavaScript functions with their jQuery equivalents.
+M CHANGES.rst
+M plone/app/z3cform/configure.zcml
+
+diff --git a/CHANGES.rst b/CHANGES.rst
+index a1b148e..e84c3e1 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 c50e2a6..3d8f096 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>
+
+
+Repository: plone.app.z3cform
+Branch: refs/heads/master
+Date: 2015-03-24T01:44:10+01:00
+Author: Johannes Raggam (thet) <raggam-nl@adm.at>
+Commit: https://github.com/plone/plone.app.z3cform/commit/608f9732d143a5beacf65389c2728e5900f7e14a
+
+Merge pull request #18 from plone/thet-iploneformlayer
+
+use more specific form layer
+
+Files changed:
+M CHANGES.rst
+M plone/app/z3cform/configure.zcml
+
+diff --git a/CHANGES.rst b/CHANGES.rst
+index a1b148e..e84c3e1 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 c50e2a6..3d8f096 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"/>
 
- 1.10.5 (2015-03-13)
-diff --git a/Products/Archetypes/skins/archetypes/reference_focus_js.dtml b/Products/Archetypes/skins/archetypes/reference_focus_js.dtml
-index ae82e95..a9d4bcd 100644
---- a/Products/Archetypes/skins/archetypes/reference_focus_js.dtml
-+++ b/Products/Archetypes/skins/archetypes/reference_focus_js.dtml
-@@ -12,6 +12,6 @@ function unRegisterPloneFunction(func){
-   }
+   <adapter factory=".widget.RichTextFieldWidget"
+            for="plone.app.textfield.interfaces.IRichText
+-                z3c.form.interfaces.IFormLayer"/>
++                plone.app.z3cform.interfaces.IPloneFormLayer"/>
 
- unRegisterPloneFunction(setFocus);
--registerPloneFunction(focusOnReferenceField);
-+jQuery(focusOnReferenceField);
- -->
- </dtml-if>
+ </configure>