plone.app.querystring 2.1.5__tar.gz → 3.0.0a2__tar.gz

{plone_app_querystring-2.1.5 → plone_app_querystring-3.0.0a2}/CHANGES.rst

@@ -8,14 +8,14 @@ Changelog
 
 .. towncrier release notes start
 
-2.1.5 (2026-02-26)
-------------------
+3.0.0a2 (2025-11-26)
+--------------------
 
-Internal:
+Bug fixes:
 
 
-- Update configuration files.
-  [plone devs]
+- Don't ignore sort_on values which are not ZCatalog indexes. @davisagli (#173)
+- Don't include vocabulary values in QuerystringRegistryReader results if the current user doesn't have permission for the vocabulary. @davisagli
 
 
 Tests:
@@ -24,6 +24,16 @@ Tests:
 - Fix tests for ``not`` queries in ``Products.ZCatalog`` 7.2.0+.  [maurits]
 
 
+3.0.0a1 (2025-11-19)
+--------------------
+
+Breaking changes:
+
+
+- Replace ``pkg_resources`` namespace with PEP 420 native namespace.
+  Support only Plone 6.2 and Python 3.10+. (#3928)
+
+
 2.1.4 (2025-09-11)
 ------------------
 

{plone_app_querystring-2.1.5/src/plone.app.querystring.egg-info → plone_app_querystring-3.0.0a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plone.app.querystring
-Version: 2.1.5
+Version: 3.0.0a2
 Summary: A queryparser, querybuilder and extra helper tools, to parse stored queries to actual results, used in new style Plone collections
 Home-page: https://github.com/plone/plone.app.querystring
 Author: Plone Foundation
@@ -9,18 +9,13 @@ License: GPL version 2
 Keywords: collection queries
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Framework :: Plone
-Classifier: Framework :: Plone :: 6.0
-Classifier: Framework :: Plone :: 6.1
+Classifier: Framework :: Plone :: 6.2
 Classifier: Framework :: Plone :: Core
 Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Requires-Python: >=3.9
-Requires-Dist: setuptools
+Requires-Python: >=3.10
 Requires-Dist: plone.app.contentlisting
 Requires-Dist: plone.app.registry>=1.1
 Requires-Dist: plone.app.vocabularies
@@ -30,12 +25,12 @@ Requires-Dist: plone.i18n
 Requires-Dist: plone.registry
 Requires-Dist: plone.uuid
 Requires-Dist: Products.GenericSetup
-Requires-Dist: Products.ZCatalog
 Requires-Dist: python-dateutil
 Requires-Dist: Zope
 Requires-Dist: zope.dottedname
 Requires-Dist: zope.globalrequest
 Provides-Extra: test
+Requires-Dist: plone.app.content; extra == "test"
 Requires-Dist: plone.app.testing; extra == "test"
 Requires-Dist: plone.app.contenttypes[test]; extra == "test"
 Dynamic: author
@@ -93,14 +88,14 @@ Changelog
 
 .. towncrier release notes start
 
-2.1.5 (2026-02-26)
-------------------
+3.0.0a2 (2025-11-26)
+--------------------
 
-Internal:
+Bug fixes:
 
 
-- Update configuration files.
-  [plone devs]
+- Don't ignore sort_on values which are not ZCatalog indexes. @davisagli (#173)
+- Don't include vocabulary values in QuerystringRegistryReader results if the current user doesn't have permission for the vocabulary. @davisagli
 
 
 Tests:
@@ -109,6 +104,16 @@ Tests:
 - Fix tests for ``not`` queries in ``Products.ZCatalog`` 7.2.0+.  [maurits]
 
 
+3.0.0a1 (2025-11-19)
+--------------------
+
+Breaking changes:
+
+
+- Replace ``pkg_resources`` namespace with PEP 420 native namespace.
+  Support only Plone 6.2 and Python 3.10+. (#3928)
+
+
 2.1.4 (2025-09-11)
 ------------------
 

{plone_app_querystring-2.1.5 → plone_app_querystring-3.0.0a2}/pyproject.toml

@@ -120,6 +120,7 @@ Zope = [
 ]
 python-dateutil = ['dateutil']
 pytest-plone = ['pytest', 'zope.pytestlayer', 'plone.testing', 'plone.app.testing']
+ignore-packages = ['plone.app.content']
 'Products.ZCatalog' = ['Products.ZCTextIndex']
 
 ##

{plone_app_querystring-2.1.5 → plone_app_querystring-3.0.0a2}/setup.py

@@ -1,8 +1,7 @@
-from setuptools import find_packages
 from setuptools import setup
 
 
-version = "2.1.5"
+version = "3.0.0a2"
 
 long_description = open("README.rst").read() + "\n"
 long_description += open("CHANGES.rst").read()
@@ -19,30 +18,22 @@ setup(
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Framework :: Plone",
-        "Framework :: Plone :: 6.0",
-        "Framework :: Plone :: 6.1",
+        "Framework :: Plone :: 6.2",
         "Framework :: Plone :: Core",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
-        "Programming Language :: Python :: 3.12",
-        "Programming Language :: Python :: 3.13",
     ],
     keywords="collection queries",
     author="Plone Foundation",
     author_email="plone-developers@lists.sourceforge.net",
     url="https://github.com/plone/plone.app.querystring",
     license="GPL version 2",
-    packages=find_packages("src"),
-    package_dir={"": "src"},
-    namespace_packages=["plone", "plone.app"],
     include_package_data=True,
     zip_safe=False,
-    python_requires=">=3.9",
+    python_requires=">=3.10",
     install_requires=[
-        "setuptools",
         "plone.app.contentlisting",
         "plone.app.registry>=1.1",
         "plone.app.vocabularies",
@@ -52,7 +43,6 @@ setup(
         "plone.registry",
         "plone.uuid",
         "Products.GenericSetup",
-        "Products.ZCatalog",
         "python-dateutil",
         "Zope",
         "zope.dottedname",
@@ -60,6 +50,7 @@ setup(
     ],
     extras_require={
         "test": [
+            "plone.app.content",
             "plone.app.testing",
             "plone.app.contenttypes[test]",
         ]

{plone_app_querystring-2.1.5 → plone_app_querystring-3.0.0a2}/src/plone/app/querystring/queryparser.py

@@ -78,12 +78,9 @@ def parseFormquery(context, formquery, sort_on=None, sort_order=None):
 
     # Add sorting (sort_on and sort_order) to the query
     if sort_on:
-        catalog = getToolByName(context, "portal_catalog")
-        # I get crazy sort_ons like '194' or 'null'.
-        if sort_on in catalog.indexes():
-            query["sort_on"] = sort_on
-            if sort_order:
-                query["sort_order"] = sort_order
+        query["sort_on"] = sort_on
+        if sort_order:
+            query["sort_order"] = sort_order
     return query
 
 

{plone_app_querystring-2.1.5 → plone_app_querystring-3.0.0a2}/src/plone/app/querystring/registryreader.py

@@ -1,12 +1,11 @@
+from AccessControl import getSecurityManager
+from Acquisition import aq_parent
 from collections import OrderedDict
 from plone.app.querystring.interfaces import IQuerystringRegistryReader
 from plone.base.utils import safe_text
 from plone.i18n.normalizer.interfaces import IIDNormalizer
-from Products.CMFCore.utils import getToolByName
-from Products.ZCTextIndex.interfaces import IZCTextIndex
 from zope.component import getUtility
 from zope.component import queryUtility
-from zope.component.hooks import getSite
 from zope.globalrequest import getRequest
 from zope.i18n import translate
 from zope.i18nmessageid import Message
@@ -16,6 +15,13 @@ from zope.schema.interfaces import IVocabularyFactory
 import logging
 
 
+try:
+    from plone.app.content.browser.vocabulary import DEFAULT_PERMISSION
+    from plone.app.content.browser.vocabulary import PERMISSIONS
+except ImportError:
+    PERMISSIONS = {}
+    DEFAULT_PERMISSION = "View"
+
 logger = logging.getLogger("plone.app.querystring")
 
 
@@ -42,7 +48,7 @@ class QuerystringRegistryReader:
             request = getRequest()
 
         self.context = context
-        self.vocab_context = context
+        self.vocab_context = aq_parent(context)
         self.request = request
 
     def parseRegistry(self):
@@ -71,6 +77,10 @@ class QuerystringRegistryReader:
 
         return result
 
+    def _checkVocabularyPermission(self, vocab_name):
+        permission = PERMISSIONS.get(vocab_name, DEFAULT_PERMISSION)
+        return getSecurityManager().checkPermission(permission, self.vocab_context)
+
     def getVocabularyValues(self, values):
         """Get all vocabulary values if a vocabulary is defined"""
         id_normalize = getUtility(IIDNormalizer).normalize
@@ -88,6 +98,9 @@ class QuerystringRegistryReader:
                 # Bail out if the annotation is marked not to fetch the vocabulary
                 # to allow the widget to query the vocabulary as needed
                 continue
+            if not self._checkVocabularyPermission(vocabulary):
+                # Don't include vocab values if user doesn't have permission
+                continue
             for item in utility(self.vocab_context):
                 if isinstance(item.title, Message):
                     title = translate(item.title, context=self.request)
@@ -117,14 +130,9 @@ class QuerystringRegistryReader:
 
     def mapSortableIndexes(self, values):
         """Map sortable indexes"""
-        catalog = getToolByName(getSite(), "portal_catalog")._catalog
         sortables = {}
         for key, field in values.get("%s.field" % self.prefix).items():
-            if (
-                field["sortable"]
-                and key in catalog.indexes
-                and not IZCTextIndex.providedBy(catalog.getIndex(key))
-            ):
+            if field["sortable"]:
                 sortables[key] = values.get(f"{self.prefix}.field.{key}")
         values["sortable"] = sortables
         return values

{plone_app_querystring-2.1.5 → plone_app_querystring-3.0.0a2}/src/plone/app/querystring/tests/testQueryBuilder.py

@@ -123,13 +123,11 @@ class TestQuerybuilder(unittest.TestCase):
             }
         ]
         results = self.querybuilder._makequery(query=query)
-        # Since Products.ZCatalog 7.2.0 the Plone Site is also returned.
-        # To keep the test compatible with both older and newer versions,
-        # only assert that the page with subject 'Lorem' is not part of the
-        # results (the presence of the Plone site itself may vary by ZCatalog
-        # version).
-        self.assertNotIn(
-            self.testpage.absolute_url(), [brain.getURL() for brain in results]
+        # We used to expect 1 result.  But in fact the Plone Site should also
+        # be in the results.  This happens since Products.ZCatalog 7.2.0.
+        self.assertEqual(
+            sorted([brain.getURL() for brain in results]),
+            ["http://nohost/plone", "http://nohost/plone/testfolder"],
         )
 
     def testMakeQueryWithMultipleSubject(self):
@@ -159,13 +157,11 @@ class TestQuerybuilder(unittest.TestCase):
             }
         ]
         results = self.querybuilder._makequery(query=query)
-        # Since Products.ZCatalog 7.2.0 the Plone Site is also returned.
-        # To keep the test compatible with both older and newer versions,
-        # only assert that the page with subject 'Lorem' is not part of the
-        # results (the presence of the Plone site itself may vary by ZCatalog
-        # version).
-        self.assertNotIn(
-            self.testpage.absolute_url(), [brain.getURL() for brain in results]
+        # We used to expect 1 result.  But in fact the Plone Site should also
+        # be in the results.  This happens since Products.ZCatalog 7.2.0.
+        self.assertEqual(
+            sorted([brain.getURL() for brain in results]),
+            ["http://nohost/plone", "http://nohost/plone/testfolder"],
         )
 
     def testMakeQueryWithSubjectWithSpecialCharacters(self):
@@ -411,6 +407,10 @@ class TestQuerybuilder(unittest.TestCase):
         for _in, _out in search_term_tests:
             self.assertEqual(munge_search_term(_in), _out)
 
+    def test_query_builder_unknown_sort(self):
+        results = self.querybuilder(query=self.query, sort_on="unknown")
+        self.assertEqual(len(results), 1)
+
 
 class TestQuerybuilderResultTypes(unittest.TestCase):
     layer = TEST_PROFILE_PLONEAPPQUERYSTRING_INTEGRATION_TESTING

{plone_app_querystring-2.1.5 → plone_app_querystring-3.0.0a2}/src/plone/app/querystring/tests/testQueryParser.py

@@ -191,7 +191,14 @@ class TestQueryParser(TestQueryParserBase):
             sort_on="unknown",
             sort_order="reverse",
         )
-        self.assertEqual(parsed, {"Title": {"query": "Welcome to Plone"}})
+        self.assertEqual(
+            parsed,
+            {
+                "Title": {"query": "Welcome to Plone"},
+                "sort_on": "unknown",
+                "sort_order": "reverse",
+            },
+        )
 
     def test_path_explicit(self):
         data = {

{plone_app_querystring-2.1.5 → plone_app_querystring-3.0.0a2}/src/plone/app/querystring/tests/testRegistryReader.py

@@ -2,8 +2,10 @@ from plone.app.querystring.interfaces import IQuerystringRegistryReader
 from plone.app.querystring.registryreader import DottedDict
 from plone.app.querystring.testing import PLONEAPPQUERYSTRING_INTEGRATION_TESTING
 from plone.app.querystring.tests import registry_testdata as td
+from plone.app.testing import logout
 from plone.registry import Registry
 from plone.registry.interfaces import IRegistry
+from unittest import mock
 from zope.component import getGlobalSiteManager
 from zope.interface import implementer
 from zope.schema.interfaces import IVocabularyFactory
@@ -97,6 +99,23 @@ class TestRegistryReader(unittest.TestCase):
         vocabulary_result = result.get("plone.app.querystring.field.reviewState.values")
         self.assertEqual(vocabulary_result, {"subsite term": {"title": "subsite term"}})
 
+    def test_get_vocabularies_checks_permission(self):
+        logout()
+        from plone.app.content.browser.vocabulary import PERMISSIONS
+
+        with mock.patch.dict(
+            PERMISSIONS,
+            {"plone.app.querystring.tests.testvocabulary": "Manage portal content"},
+        ):
+            registry = self.createRegistry(td.test_vocabulary_xml)
+            reader = IQuerystringRegistryReader(registry)
+            result = reader.parseRegistry()
+            result = reader.getVocabularyValues(result)
+            vocabulary_result = result.get(
+                "plone.app.querystring.field.reviewState.values"
+            )
+            self.assertEqual(vocabulary_result, {})
+
     def test_map_operations_clean(self):
         """tests if mapOperations is getting all operators correctly"""
         registry = self.createRegistry(td.minimal_correct_xml)

{plone_app_querystring-2.1.5 → plone_app_querystring-3.0.0a2/src/plone.app.querystring.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plone.app.querystring
-Version: 2.1.5
+Version: 3.0.0a2
 Summary: A queryparser, querybuilder and extra helper tools, to parse stored queries to actual results, used in new style Plone collections
 Home-page: https://github.com/plone/plone.app.querystring
 Author: Plone Foundation
@@ -9,18 +9,13 @@ License: GPL version 2
 Keywords: collection queries
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Framework :: Plone
-Classifier: Framework :: Plone :: 6.0
-Classifier: Framework :: Plone :: 6.1
+Classifier: Framework :: Plone :: 6.2
 Classifier: Framework :: Plone :: Core
 Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Requires-Python: >=3.9
-Requires-Dist: setuptools
+Requires-Python: >=3.10
 Requires-Dist: plone.app.contentlisting
 Requires-Dist: plone.app.registry>=1.1
 Requires-Dist: plone.app.vocabularies
@@ -30,12 +25,12 @@ Requires-Dist: plone.i18n
 Requires-Dist: plone.registry
 Requires-Dist: plone.uuid
 Requires-Dist: Products.GenericSetup
-Requires-Dist: Products.ZCatalog
 Requires-Dist: python-dateutil
 Requires-Dist: Zope
 Requires-Dist: zope.dottedname
 Requires-Dist: zope.globalrequest
 Provides-Extra: test
+Requires-Dist: plone.app.content; extra == "test"
 Requires-Dist: plone.app.testing; extra == "test"
 Requires-Dist: plone.app.contenttypes[test]; extra == "test"
 Dynamic: author
@@ -93,14 +88,14 @@ Changelog
 
 .. towncrier release notes start
 
-2.1.5 (2026-02-26)
-------------------
+3.0.0a2 (2025-11-26)
+--------------------
 
-Internal:
+Bug fixes:
 
 
-- Update configuration files.
-  [plone devs]
+- Don't ignore sort_on values which are not ZCatalog indexes. @davisagli (#173)
+- Don't include vocabulary values in QuerystringRegistryReader results if the current user doesn't have permission for the vocabulary. @davisagli
 
 
 Tests:
@@ -109,6 +104,16 @@ Tests:
 - Fix tests for ``not`` queries in ``Products.ZCatalog`` 7.2.0+.  [maurits]
 
 
+3.0.0a1 (2025-11-19)
+--------------------
+
+Breaking changes:
+
+
+- Replace ``pkg_resources`` namespace with PEP 420 native namespace.
+  Support only Plone 6.2 and Python 3.10+. (#3928)
+
+
 2.1.4 (2025-09-11)
 ------------------
 

{plone_app_querystring-2.1.5 → plone_app_querystring-3.0.0a2}/src/plone.app.querystring.egg-info/SOURCES.txt

@@ -6,16 +6,13 @@ pyproject.toml
 setup.py
 docs/LICENSE.GPL
 docs/LICENSE.txt
-src/plone/__init__.py
 src/plone.app.querystring.egg-info/PKG-INFO
 src/plone.app.querystring.egg-info/SOURCES.txt
 src/plone.app.querystring.egg-info/dependency_links.txt
 src/plone.app.querystring.egg-info/entry_points.txt
-src/plone.app.querystring.egg-info/namespace_packages.txt
 src/plone.app.querystring.egg-info/not-zip-safe
 src/plone.app.querystring.egg-info/requires.txt
 src/plone.app.querystring.egg-info/top_level.txt
-src/plone/app/__init__.py
 src/plone/app/querystring/__init__.py
 src/plone/app/querystring/configure.zcml
 src/plone/app/querystring/hiddenprofiles.py

{plone_app_querystring-2.1.5 → plone_app_querystring-3.0.0a2}/src/plone.app.querystring.egg-info/requires.txt

@@ -1,4 +1,3 @@
-setuptools
 plone.app.contentlisting
 plone.app.registry>=1.1
 plone.app.vocabularies
@@ -8,12 +7,12 @@ plone.i18n
 plone.registry
 plone.uuid
 Products.GenericSetup
-Products.ZCatalog
 python-dateutil
 Zope
 zope.dottedname
 zope.globalrequest
 
 [test]
+plone.app.content
 plone.app.testing
 plone.app.contenttypes[test]

plone_app_querystring-2.1.5/src/plone/__init__.py

@@ -1 +0,0 @@
-__import__("pkg_resources").declare_namespace(__name__)

plone_app_querystring-2.1.5/src/plone/app/__init__.py

@@ -1 +0,0 @@
-__import__("pkg_resources").declare_namespace(__name__)

plone_app_querystring-2.1.5/src/plone.app.querystring.egg-info/namespace_packages.txt

@@ -1,2 +0,0 @@
-plone
-plone.app