From de079b796a7a967699c13fc40945ed6bdd442f21 Mon Sep 17 00:00:00 2001 From: Maurits van Rees Date: Sat, 15 Jun 2024 23:45:34 +0200 Subject: [PATCH 1/2] Bumped version for breaking release. [ci skip] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 372d6fd4..d6af0679 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup -version = "5.0.8.dev0" +version = "6.0.0.dev0" setup( name="plone.app.portlets", From af8b150e8a61f0c30a842fc5c6b5db5c02076ee3 Mon Sep 17 00:00:00 2001 From: Maurits van Rees Date: Sat, 15 Jun 2024 23:47:01 +0200 Subject: [PATCH 2/2] Remove use of portal_properties. Theoretically we were using this for sorting the navigation portlet. --- news/125.breaking | 3 +++ plone/app/portlets/portlets/navigation.py | 11 ----------- 2 files changed, 3 insertions(+), 11 deletions(-) create mode 100644 news/125.breaking diff --git a/news/125.breaking b/news/125.breaking new file mode 100644 index 00000000..8336c5b1 --- /dev/null +++ b/news/125.breaking @@ -0,0 +1,3 @@ +Remove use of portal_properties. +Theoretically we were using this for sorting the navigation portlet. +[maurits] diff --git a/plone/app/portlets/portlets/navigation.py b/plone/app/portlets/portlets/navigation.py index f1fc0819..d517562e 100644 --- a/plone/app/portlets/portlets/navigation.py +++ b/plone/app/portlets/portlets/navigation.py @@ -406,9 +406,6 @@ def __init__(self, context, portlet): self.context = context self.portlet = portlet - portal_properties = getToolByName(context, "portal_properties") - navtree_properties = getattr(portal_properties, "navtree_properties") - # Acquire a custom nav query if available customQuery = getattr(context, "getCustomNavQuery", None) if customQuery is not None and safe_callable(customQuery): @@ -443,14 +440,6 @@ def __init__(self, context, portlet): # Only list the applicable types query["portal_type"] = typesToList(context) - # Apply the desired sort - sortAttribute = navtree_properties.getProperty("sortAttribute", None) - if sortAttribute is not None: - query["sort_on"] = sortAttribute - sortOrder = navtree_properties.getProperty("sortOrder", None) - if sortOrder is not None: - query["sort_order"] = sortOrder - # Filter on workflow states, if enabled registry = getUtility(IRegistry) navigation_settings = registry.forInterface(INavigationSchema, prefix="plone")