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

In tests, use 'selection.any' in querystrings.
plone · Nov 25, 2015 · a40b003 · a40b003
2 parents b93fdf7 + bc73cd3
commit a40b003
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 16 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -10,8 +10,19 @@ New:
 
 Fixes:
 
-- Add upgrade step to replace selection.is with selection.any operations in
-  querystrings also for objects using the Collection behavior.
+- Again upgrade collections with ``selection.is`` to
+  ``selection.any``, because the standard events and news collections
+  may have been wrongly created in a new site.
+  Issue https://github.com/plone/Products.CMFPlone/issues/1040
+  [maurits]
+
+- In tests, use ``selection.any`` in querystrings.
+  Issue https://github.com/plone/Products.CMFPlone/issues/1040
+  [maurits]
+
+- Added upgrade step to replace ``selection.is`` with
+  ``selection.any`` operations in querystrings also for objects using
+  the Collection behavior.
   [thet]
 
 

diff --git a/plone/app/querystring/tests/testQueryBuilder.py b/plone/app/querystring/tests/testQueryBuilder.py
@@ -74,7 +74,7 @@ def testMakeQueryWithSubject(self):
         self.testpage.reindexObject()
         query = [{
             'i': 'Subject',
-            'o': 'plone.app.querystring.operation.selection.is',
+            'o': 'plone.app.querystring.operation.selection.any',
             'v': 'Lorem',
         }]
         results = self.querybuilder._makequery(query=query)
@@ -88,7 +88,7 @@ def testMakeQueryWithMultipleSubject(self):
         self.testpage.reindexObject()
         query = [{
             'i': 'Subject',
-            'o': 'plone.app.querystring.operation.selection.is',
+            'o': 'plone.app.querystring.operation.selection.any',
             'v': ['Lorem', 'Ipsum'],
         }]
         results = self.querybuilder._makequery(query=query)
@@ -102,7 +102,7 @@ def testMakeQueryWithSubjectWithSpecialCharacters(self):
         self.testpage.reindexObject()
         query = [{
             'i': 'Subject',
-            'o': 'plone.app.querystring.operation.selection.is',
+            'o': 'plone.app.querystring.operation.selection.any',
             'v': 'Äüö',
         }]
         results = self.querybuilder._makequery(query=query)
@@ -119,7 +119,7 @@ def testMakeQueryWithUnicodeSubjectWithSpecialCharacters(self):
         self.testpage.reindexObject()
         query = [{
             'i': 'Subject',
-            'o': 'plone.app.querystring.operation.selection.is',
+            'o': 'plone.app.querystring.operation.selection.any',
             'v': u'Äüö',
         }]
         results = self.querybuilder._makequery(query=query)
@@ -136,7 +136,7 @@ def testMakeQueryWithUnicodeSubjectWithMultipleSubjects(self):
         self.testpage.reindexObject()
         query = [{
             'i': 'Subject',
-            'o': 'plone.app.querystring.operation.selection.is',
+            'o': 'plone.app.querystring.operation.selection.any',
             'v': [u'Äüö', u'Üöß'],
         }]
         results = self.querybuilder._makequery(query=query)

diff --git a/plone/app/querystring/upgrades.py b/plone/app/querystring/upgrades.py
@@ -18,9 +18,10 @@ def upgrade_1_to_2_typo_in_registry(context):
     registry[name] = values
 
 
-def fix_select_all_existing_collections(
-        context,
-        query={"portal_type": "Collection"}):
+def fix_select_all_existing_collections(context, query=None):
+
+    if query is None:
+        query = {"portal_type": "Collection"}
 
     indexes_to_fix = [
         u'portal_type',

diff --git a/plone/app/querystring/upgrades.zcml b/plone/app/querystring/upgrades.zcml
@@ -121,13 +121,20 @@
       handler=".upgrades.fix_select_all_existing_collections"
       />
 
-  <genericsetup:upgradeStep
+  <genericsetup:upgradeSteps
       source="12"
       destination="13"
-      title="Fix ISyndicatableCollection objects"
-      profile="plone.app.querystring:default"
-      description="Fix indexes on Dexterity objects by changing 'is' operators to 'any'. All objects using the Collection behavior are fixed."
-      handler=".upgrades.fix_select_all_syndicatable_collections"
-      />
+      profile="plone.app.querystring:default">
+    <genericsetup:upgradeStep
+        title="Fix ISyndicatableCollection objects"
+        description="Fix indexes on Dexterity objects by changing 'is' operators to 'any'. All objects using the Collection behavior are fixed."
+        handler=".upgrades.fix_select_all_syndicatable_collections"
+        />
+    <genericsetup:upgradeStep
+        title="Fix existing collections"
+        description="Fix indexes on existing collections by changing 'is' operators to 'any'"
+        handler=".upgrades.fix_select_all_existing_collections"
+        />
+  </genericsetup:upgradeSteps>
 
 </configure>