From 9e760fb4d9a6b07710636012e926f47139758bb6 Mon Sep 17 00:00:00 2001 From: Maurits van Rees Date: Mon, 23 Nov 2015 15:02:43 +0100 Subject: [PATCH] Create standard news/events collections with selection.any. Issue https://github.com/plone/Products.CMFPlone/issues/1040 --- CHANGES.rst | 4 ++++ Products/ATContentTypes/setuphandlers.py | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index f5d2567a..e91b29cc 100644 --- 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 index 89059d15..f9729eb9 100644 --- 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')