Merge branch '4.3' of github.com:plone/buildout.coredev into 4.3

plone · May 20, 2015 · 0b50845 · 0b50845
2 parents 965cc37 + e1c3b49
commit 0b50845
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 72 deletions.
diff --git a/checkouts.cfg b/checkouts.cfg
@@ -3,6 +3,7 @@ always-checkout = force
 auto-checkout =
     Products.CMFFormController
     plone.app.locales
+    plone.app.users
     plone.dexterity
 # Test fixes only (or otherwise not-gonna-release changes)
     collective.testcaselayer
diff --git a/last_commit.txt b/last_commit.txt
@@ -1,100 +1,98 @@
-Repository: plone.dexterity
+Repository: Products.CMFFormController
 Branch: refs/heads/master
-Date: 2015-05-13T18:07:57+02:00
-Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
-Commit: https://github.com/plone/plone.dexterity/commit/c38970f71c8e1bf9becd4a8905072fb9bc90a7dd
+Date: 2015-05-20T09:41:22+02:00
+Author: Andrea Cecchi (cekk) <andrea.cecchi85@gmail.com>
+Commit: https://github.com/plone/Products.CMFFormController/commit/a3dd466ab41b97d9e3297aca835db72c72baa849
+
+additional check for entry deletion
+
+Files changed:
+M Products/CMFFormController/BaseControllerPageTemplate.py
+
+diff --git a/Products/CMFFormController/BaseControllerPageTemplate.py b/Products/CMFFormController/BaseControllerPageTemplate.py
+index 688e74b..34fea5c 100644
+--- a/Products/CMFFormController/BaseControllerPageTemplate.py
++++ b/Products/CMFFormController/BaseControllerPageTemplate.py
+@@ -24,7 +24,8 @@ def _call(self, inherited_call, *args, **kwargs):
+             controller_state = self.getButton(controller_state, REQUEST)
+             validators = self.getValidators(controller_state, REQUEST).getValidators()
+             controller_state = controller.validate(controller_state, REQUEST, validators)
+-            del REQUEST.form['form.submitted']
++            if 'form.submitted' in REQUEST.form:
++                del REQUEST.form['form.submitted']
+             return self.getNext(controller_state, REQUEST)
+
+         kwargs['state'] = controller_state
+
 
-fixes #27 createContent ignores empty fields
+Repository: Products.CMFFormController
+Branch: refs/heads/master
+Date: 2015-05-20T09:41:34+02:00
+Author: Andrea Cecchi (cekk) <andrea.cecchi85@gmail.com>
+Commit: https://github.com/plone/Products.CMFFormController/commit/96e3e4f79df66d54829fea63dc6db211b244fe93
+
+updated changes
 
 Files changed:
-M CHANGES.rst
-M plone/dexterity/utils.py
+M CHANGES.txt
 
-diff --git a/CHANGES.rst b/CHANGES.rst
-index 8d265b2..8605cdf 100644
---- a/CHANGES.rst
-+++ b/CHANGES.rst
+diff --git a/CHANGES.txt b/CHANGES.txt
+index 5debdfc..a88b9c3 100644
+--- a/CHANGES.txt
++++ b/CHANGES.txt
 @@ -4,7 +4,8 @@ Changelog
- 2.3.1 (unreleased)
+ 3.0.5 (unreleased)
  ------------------
 
 -- Nothing changed yet.
-+- fix #27: createContent ignores empty fields
-+  [jensens]
-
++- Additional check in BaseControllerPageTemplate when we try to delete an entry
++  from the request, that has already been deleted [cekk]
 
- 2.3.0 (2015-03-13)
-diff --git a/plone/dexterity/utils.py b/plone/dexterity/utils.py
-index ca6a286..b493357 100644
---- a/plone/dexterity/utils.py
-+++ b/plone/dexterity/utils.py
-@@ -137,12 +137,12 @@ def createContent(portal_type, **kw):
-         for name, value in fields.items():
-             try:
-                 # hasattr swallows exceptions.
--                if getattr(behavior, name):
--                    setattr(behavior, name, value)
--                    del fields[name]
-+                getattr(behavior, name)
-             except AttributeError:
-                 # fieldname not available
--                pass
-+                continue
-+            setattr(behavior, name, value)
-+            del fields[name]
 
-     for (key, value) in fields.items():
-         setattr(content, key, value)
+ 3.0.4 (2015-03-08)
 
 
-Repository: plone.dexterity
+Repository: Products.CMFFormController
 Branch: refs/heads/master
-Date: 2015-05-15T11:31:12+02:00
+Date: 2015-05-20T13:23:51+02:00
 Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
-Commit: https://github.com/plone/plone.dexterity/commit/b3d554e69ff509d45ac4deb14faeb9590bd7fdaf
+Commit: https://github.com/plone/Products.CMFFormController/commit/12167fbc592155e560a5e069a3819f57deba8080
 
-Merge pull request #28 from plone/fix-27-createContent_ignores_empty_fields
+Merge pull request #2 from plone/submitted_secure_deletion
 
-fixes #27 createContent ignores empty fields
+form.submitted secure deletion
 
 Files changed:
-M CHANGES.rst
-M plone/dexterity/utils.py
+M CHANGES.txt
+M Products/CMFFormController/BaseControllerPageTemplate.py
 
-diff --git a/CHANGES.rst b/CHANGES.rst
-index 8d265b2..8605cdf 100644
---- a/CHANGES.rst
-+++ b/CHANGES.rst
+diff --git a/CHANGES.txt b/CHANGES.txt
+index 5debdfc..a88b9c3 100644
+--- a/CHANGES.txt
++++ b/CHANGES.txt
 @@ -4,7 +4,8 @@ Changelog
- 2.3.1 (unreleased)
+ 3.0.5 (unreleased)
  ------------------
 
 -- Nothing changed yet.
-+- fix #27: createContent ignores empty fields
-+  [jensens]
++- Additional check in BaseControllerPageTemplate when we try to delete an entry
++  from the request, that has already been deleted [cekk]
 
 
- 2.3.0 (2015-03-13)
-diff --git a/plone/dexterity/utils.py b/plone/dexterity/utils.py
-index ca6a286..b493357 100644
---- a/plone/dexterity/utils.py
-+++ b/plone/dexterity/utils.py
-@@ -137,12 +137,12 @@ def createContent(portal_type, **kw):
-         for name, value in fields.items():
-             try:
-                 # hasattr swallows exceptions.
--                if getattr(behavior, name):
--                    setattr(behavior, name, value)
--                    del fields[name]
-+                getattr(behavior, name)
-             except AttributeError:
-                 # fieldname not available
--                pass
-+                continue
-+            setattr(behavior, name, value)
-+            del fields[name]
+ 3.0.4 (2015-03-08)
+diff --git a/Products/CMFFormController/BaseControllerPageTemplate.py b/Products/CMFFormController/BaseControllerPageTemplate.py
+index 688e74b..34fea5c 100644
+--- a/Products/CMFFormController/BaseControllerPageTemplate.py
++++ b/Products/CMFFormController/BaseControllerPageTemplate.py
+@@ -24,7 +24,8 @@ def _call(self, inherited_call, *args, **kwargs):
+             controller_state = self.getButton(controller_state, REQUEST)
+             validators = self.getValidators(controller_state, REQUEST).getValidators()
+             controller_state = controller.validate(controller_state, REQUEST, validators)
+-            del REQUEST.form['form.submitted']
++            if 'form.submitted' in REQUEST.form:
++                del REQUEST.form['form.submitted']
+             return self.getNext(controller_state, REQUEST)
 
-     for (key, value) in fields.items():
-         setattr(content, key, value)
+         kwargs['state'] = controller_state
 
 
diff --git a/versions.cfg b/versions.cfg
@@ -148,7 +148,7 @@ plone.app.jquery                      = 1.7.2
 plone.app.jquerytools                 = 1.7.0
 plone.app.layout                      = 2.3.13
 plone.app.linkintegrity               = 1.5.5
-plone.app.locales                     = 4.3.5
+plone.app.locales                     = 4.3.6
 plone.app.openid                      = 2.1.0
 plone.app.portlets                    = 2.5.3
 plone.app.querystring                 = 1.2.5