From 0c0dae7a00972b5855ea86b8b9312363cf132f31 Mon Sep 17 00:00:00 2001
From: Julien Marinescu <davisp@xenbox.fr>
Date: Thu, 6 Mar 2014 11:12:31 +0100
Subject: [PATCH 1/2] cleaning + change permission concerning editFields

---
 Products/CMFPlomino/fields/configure.zcml | 102 +++++++++++++---------
 1 file changed, 63 insertions(+), 39 deletions(-)

diff --git a/Products/CMFPlomino/fields/configure.zcml b/Products/CMFPlomino/fields/configure.zcml
index 2877f6a81..967c43d93 100644
--- a/Products/CMFPlomino/fields/configure.zcml
+++ b/Products/CMFPlomino/fields/configure.zcml
@@ -3,94 +3,113 @@
            xmlns:five="http://namespaces.zope.org/five"
            i18n_domain="CMFPlomino">
 
+  <!-- permissions -->
   <permission
      id="plomino.DESIGN_PERMISSION"
      title="CMFPlomino: Modify Database design"
      />
-     
-	<subscriber
+  <permission
+     id="plomino.EDIT_PERMISSION"
+     title="CMFPlomino: Edit documents"
+     />
+  
+  <subscriber
        for="Products.CMFPlomino.interfaces.IPlominoField zope.lifecycleevent.interfaces.IObjectModifiedEvent"
        handler=".events.afterFieldModified"
        />
-       
+  
+   <!-- SelectionField -->
    <adapter
-		for="Products.CMFPlomino.interfaces.IPlominoField"
-		provides=".selection.ISelectionField"
-		factory=".selection.SelectionField"
-		/>
+    for="Products.CMFPlomino.interfaces.IPlominoField"
+    provides=".selection.ISelectionField"
+    factory=".selection.SelectionField"
+    />
    <browser:page
         name="selectionsettings"
         for="Products.CMFPlomino.interfaces.IPlominoField"
         class=".selection.SettingForm"
         permission="plomino.DESIGN_PERMISSION"
         />
+
+   <!-- TextField -->
    <adapter
-		for="Products.CMFPlomino.interfaces.IPlominoField"
-		provides=".text.ITextField"
-		factory=".text.TextField"
-		/>
+    for="Products.CMFPlomino.interfaces.IPlominoField"
+    provides=".text.ITextField"
+    factory=".text.TextField"
+    />
    <browser:page
         name="textsettings"
         for="Products.CMFPlomino.interfaces.IPlominoField"
         class=".text.SettingForm"
         permission="plomino.DESIGN_PERMISSION"
         />
+
+   <!-- NumberField -->
    <adapter
-		for="Products.CMFPlomino.interfaces.IPlominoField"
-		provides=".number.INumberField"
-		factory=".number.NumberField"
-		/>
+    for="Products.CMFPlomino.interfaces.IPlominoField"
+    provides=".number.INumberField"
+    factory=".number.NumberField"
+    />
    <browser:page
         name="numbersettings"
         for="Products.CMFPlomino.interfaces.IPlominoField"
         class=".number.SettingForm"
         permission="plomino.DESIGN_PERMISSION"
         />
+
+   <!-- DatetimeField -->
    <adapter
-		for="Products.CMFPlomino.interfaces.IPlominoField"
-		provides=".datetime.IDatetimeField"
-		factory=".datetime.DatetimeField"
-		/>
+    for="Products.CMFPlomino.interfaces.IPlominoField"
+    provides=".datetime.IDatetimeField"
+    factory=".datetime.DatetimeField"
+    />
    <browser:page
         name="datetimesettings"
         for="Products.CMFPlomino.interfaces.IPlominoField"
         class=".datetime.SettingForm"
         permission="plomino.DESIGN_PERMISSION"
         />
+
+   <!-- NameField -->
    <adapter
-		for="Products.CMFPlomino.interfaces.IPlominoField"
-		provides=".name.INameField"
-		factory=".name.NameField"
-		/>
+    for="Products.CMFPlomino.interfaces.IPlominoField"
+    provides=".name.INameField"
+    factory=".name.NameField"
+    />
    <browser:page
         name="namesettings"
         for="Products.CMFPlomino.interfaces.IPlominoField"
         class=".name.SettingForm"
         permission="plomino.DESIGN_PERMISSION"
         />
+
+   <!-- DoclinkField -->
    <adapter
-		for="Products.CMFPlomino.interfaces.IPlominoField"
-		provides=".doclink.IDoclinkField"
-		factory=".doclink.DoclinkField"
-		/>
+    for="Products.CMFPlomino.interfaces.IPlominoField"
+    provides=".doclink.IDoclinkField"
+    factory=".doclink.DoclinkField"
+    />
    <browser:page
         name="doclinksettings"
         for="Products.CMFPlomino.interfaces.IPlominoField"
         class=".doclink.SettingForm"
         permission="plomino.DESIGN_PERMISSION"
         />
+
+   <!-- RichtextField -->
    <adapter
-		for="Products.CMFPlomino.interfaces.IPlominoField"
-		provides=".richtext.IRichtextField"
-		factory=".richtext.RichtextField"
-		/>
+    for="Products.CMFPlomino.interfaces.IPlominoField"
+    provides=".richtext.IRichtextField"
+    factory=".richtext.RichtextField"
+    />
    <browser:page
         name="richtextsettings"
         for="Products.CMFPlomino.interfaces.IPlominoField"
         class=".richtext.SettingForm"
         permission="plomino.DESIGN_PERMISSION"
         />
-        
+
+   <!-- AttachmentField -->
    <adapter
         for="Products.CMFPlomino.interfaces.IPlominoField"
         provides=".attachment.IAttachmentField"
@@ -102,6 +121,8 @@
         class=".attachment.SettingForm"
         permission="plomino.DESIGN_PERMISSION"
         />
+
+   <!-- GooglechartField -->
    <adapter
         for="Products.CMFPlomino.interfaces.IPlominoField"
         provides=".googlechart.IGooglechartField"
@@ -113,7 +134,8 @@
         class=".googlechart.SettingForm"
         permission="plomino.DESIGN_PERMISSION"
         />
-        
+
+   <!-- GooglevisualizationField -->
    <adapter
         for="Products.CMFPlomino.interfaces.IPlominoField"
         provides=".googlevisualization.IGooglevisualizationField"
@@ -126,6 +148,7 @@
         permission="plomino.DESIGN_PERMISSION"
         />
 
+   <!-- DatagridField -->
    <adapter
         for="Products.CMFPlomino.interfaces.IPlominoField"
         provides=".datagrid.IDatagridField"
@@ -138,12 +161,13 @@
         permission="plomino.DESIGN_PERMISSION"
         />
    <browser:view
-      for="Products.CMFPlomino.interfaces.IPlominoField"
-      name="editFields"
-      permission="plomino.DESIGN_PERMISSION"
-      class=".datagrid.EditFieldsAsJson"
-    />
+        for="Products.CMFPlomino.interfaces.IPlominoField"
+        name="editFields"
+        class=".datagrid.EditFieldsAsJson"
+        permission="plomino.DESIGN_PERMISSION"
+        />
 
+   <!-- BooleanField -->
    <adapter
         for="Products.CMFPlomino.interfaces.IPlominoField"
         provides=".boolean.IBooleanField"
@@ -153,7 +177,7 @@
         name="booleansettings"
         for="Products.CMFPlomino.interfaces.IPlominoField"
         class=".boolean.SettingForm"
-        permission="plomino.DESIGN_PERMISSION"
+        permission="plomino.EDIT_PERMISSION"
         />
 
    <!-- vocabularies -->

From 38666e343fa76c3f8cf951f297f1319908e26214 Mon Sep 17 00:00:00 2001
From: Julien Marinescu <davisp@xenbox.fr>
Date: Thu, 6 Mar 2014 11:55:24 +0100
Subject: [PATCH 2/2] additional fix

---
 Products/CMFPlomino/fields/configure.zcml | 60 +++++++++++------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/Products/CMFPlomino/fields/configure.zcml b/Products/CMFPlomino/fields/configure.zcml
index 967c43d93..51de951f6 100644
--- a/Products/CMFPlomino/fields/configure.zcml
+++ b/Products/CMFPlomino/fields/configure.zcml
@@ -20,10 +20,10 @@
   
    <!-- SelectionField -->
    <adapter
-    for="Products.CMFPlomino.interfaces.IPlominoField"
-    provides=".selection.ISelectionField"
-    factory=".selection.SelectionField"
-    />
+        for="Products.CMFPlomino.interfaces.IPlominoField"
+        provides=".selection.ISelectionField"
+        factory=".selection.SelectionField"
+        />
    <browser:page
         name="selectionsettings"
         for="Products.CMFPlomino.interfaces.IPlominoField"
@@ -33,10 +33,10 @@
 
    <!-- TextField -->
    <adapter
-    for="Products.CMFPlomino.interfaces.IPlominoField"
-    provides=".text.ITextField"
-    factory=".text.TextField"
-    />
+        for="Products.CMFPlomino.interfaces.IPlominoField"
+        provides=".text.ITextField"
+        factory=".text.TextField"
+        />
    <browser:page
         name="textsettings"
         for="Products.CMFPlomino.interfaces.IPlominoField"
@@ -46,10 +46,10 @@
 
    <!-- NumberField -->
    <adapter
-    for="Products.CMFPlomino.interfaces.IPlominoField"
-    provides=".number.INumberField"
-    factory=".number.NumberField"
-    />
+        for="Products.CMFPlomino.interfaces.IPlominoField"
+        provides=".number.INumberField"
+        factory=".number.NumberField"
+        />
    <browser:page
         name="numbersettings"
         for="Products.CMFPlomino.interfaces.IPlominoField"
@@ -59,10 +59,10 @@
 
    <!-- DatetimeField -->
    <adapter
-    for="Products.CMFPlomino.interfaces.IPlominoField"
-    provides=".datetime.IDatetimeField"
-    factory=".datetime.DatetimeField"
-    />
+        for="Products.CMFPlomino.interfaces.IPlominoField"
+        provides=".datetime.IDatetimeField"
+        factory=".datetime.DatetimeField"
+        />
    <browser:page
         name="datetimesettings"
         for="Products.CMFPlomino.interfaces.IPlominoField"
@@ -72,10 +72,10 @@
 
    <!-- NameField -->
    <adapter
-    for="Products.CMFPlomino.interfaces.IPlominoField"
-    provides=".name.INameField"
-    factory=".name.NameField"
-    />
+        for="Products.CMFPlomino.interfaces.IPlominoField"
+        provides=".name.INameField"
+        factory=".name.NameField"
+        />
    <browser:page
         name="namesettings"
         for="Products.CMFPlomino.interfaces.IPlominoField"
@@ -85,10 +85,10 @@
 
    <!-- DoclinkField -->
    <adapter
-    for="Products.CMFPlomino.interfaces.IPlominoField"
-    provides=".doclink.IDoclinkField"
-    factory=".doclink.DoclinkField"
-    />
+        for="Products.CMFPlomino.interfaces.IPlominoField"
+        provides=".doclink.IDoclinkField"
+        factory=".doclink.DoclinkField"
+        />
    <browser:page
         name="doclinksettings"
         for="Products.CMFPlomino.interfaces.IPlominoField"
@@ -98,10 +98,10 @@
 
    <!-- RichtextField -->
    <adapter
-    for="Products.CMFPlomino.interfaces.IPlominoField"
-    provides=".richtext.IRichtextField"
-    factory=".richtext.RichtextField"
-    />
+        for="Products.CMFPlomino.interfaces.IPlominoField"
+        provides=".richtext.IRichtextField"
+        factory=".richtext.RichtextField"
+        />
    <browser:page
         name="richtextsettings"
         for="Products.CMFPlomino.interfaces.IPlominoField"
@@ -164,7 +164,7 @@
         for="Products.CMFPlomino.interfaces.IPlominoField"
         name="editFields"
         class=".datagrid.EditFieldsAsJson"
-        permission="plomino.DESIGN_PERMISSION"
+        permission="plomino.EDIT_PERMISSION"
         />
 
    <!-- BooleanField -->
@@ -177,7 +177,7 @@
         name="booleansettings"
         for="Products.CMFPlomino.interfaces.IPlominoField"
         class=".boolean.SettingForm"
-        permission="plomino.EDIT_PERMISSION"
+        permission="plomino.DESIGN_PERMISSION"
         />
 
    <!-- vocabularies -->