Merge pull request #27 from plone/cmfplone-issue-1040

Create standard news/events collections with selection.any.
plone · Nov 25, 2015 · 00b3003 · 00b3003
2 parents 056e4f5 + 9e760fb
commit 00b3003
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -13,6 +13,10 @@ Fixes:
 - Update Site Setup link in all control panels (fixes https://github.com/plone/Products.CMFPlone/issues/1255)
   [davilima6]
 
+- Create standard news/events collections with ``selection.any``.
+  Issue https://github.com/plone/Products.CMFPlone/issues/1040
+  [maurits]
+
 
 2.2.8 (2015-10-28)
 ------------------

diff --git a/Products/ATContentTypes/setuphandlers.py b/Products/ATContentTypes/setuphandlers.py
@@ -168,10 +168,10 @@ def setupPortalContent(p):
         topic.setLanguage(language)
 
         query = [{'i': 'portal_type',
-                  'o': 'plone.app.querystring.operation.selection.is',
+                  'o': 'plone.app.querystring.operation.selection.any',
                   'v': ['News Item']},
                  {'i': 'review_state',
-                  'o': 'plone.app.querystring.operation.selection.is',
+                  'o': 'plone.app.querystring.operation.selection.any',
                   'v': ['published']}]
         topic.setQuery(query)
 
@@ -218,13 +218,13 @@ def setupPortalContent(p):
         topic.setLanguage(language)
 
         query = [{'i': 'portal_type',
-                  'o': 'plone.app.querystring.operation.selection.is',
+                  'o': 'plone.app.querystring.operation.selection.any',
                   'v': ['Event']},
                  {'i': 'start',
                   'o': 'plone.app.querystring.operation.date.afterToday',
                   'v': ''},
                  {'i': 'review_state',
-                  'o': 'plone.app.querystring.operation.selection.is',
+                  'o': 'plone.app.querystring.operation.selection.any',
                   'v': ['published']}]
         topic.setQuery(query)
         topic.setSort_on('start')