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

Create standard news/events collections with selection.any.
plone · Nov 25, 2015 · fe1d27e · fe1d27e
2 parents 976d9f5 + 560ff48
commit fe1d27e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -11,6 +11,10 @@ New:
 
 Fixes:
 
+- Create standard news/events collections with ``selection.any``.
+  Issue https://github.com/plone/Products.CMFPlone/issues/1040
+  [maurits]
+
 - Avoid AttributeError from potential acquisition issues with folder listings
   [vangheem]
 

diff --git a/plone/app/contenttypes/setuphandlers.py b/plone/app/contenttypes/setuphandlers.py
@@ -232,11 +232,11 @@ def create_news_topic(portal, target_language):
         #: Query by Type and Review State
         aggregator.query = [
             {'i': u'portal_type',
-             'o': u'plone.app.querystring.operation.selection.is',
+             'o': u'plone.app.querystring.operation.selection.any',
              'v': [u'News Item'],
              },
             {'i': u'review_state',
-             'o': u'plone.app.querystring.operation.selection.is',
+             'o': u'plone.app.querystring.operation.selection.any',
              'v': [u'published'],
              },
         ]
@@ -279,11 +279,11 @@ def create_events_topic(portal, target_language):
         #: Query by Type and Review State
         aggregator.query = [
             {'i': 'portal_type',
-             'o': 'plone.app.querystring.operation.selection.is',
+             'o': 'plone.app.querystring.operation.selection.any',
              'v': ['Event']
              },
             {'i': 'review_state',
-             'o': 'plone.app.querystring.operation.selection.is',
+             'o': 'plone.app.querystring.operation.selection.any',
              'v': ['published']
              },
         ]

diff --git a/plone/app/contenttypes/tests/test_content_profile.py b/plone/app/contenttypes/tests/test_content_profile.py
@@ -173,10 +173,10 @@ def test_news_allowable_types(self):
     def test_news_aggregator_settings(self):
         # Has the news aggregator (Collection) been set up?
         query = [dict(i=u'portal_type',
-                      o=u'plone.app.querystring.operation.selection.is',
+                      o=u'plone.app.querystring.operation.selection.any',
                       v=[u'News Item']),
                  dict(i=u'review_state',
-                      o=u'plone.app.querystring.operation.selection.is',
+                      o=u'plone.app.querystring.operation.selection.any',
                       v=[u'published']),
                  ]
         collection = self.portal['news']['aggregator']