Merge branch 'main' into ricorrenze_reggio

RedTurtle · Oct 28, 2024 · a8ae479 · a8ae479
2 parents 7620795 + 5806346
commit a8ae479
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,9 +1,24 @@
 Changelog
 =========
 
-6.2.20 (unreleased)
+6.2.22 (unreleased)
 -------------------
 
+- Nothing changed yet.
+
+
+6.2.21 (2024-10-23)
+-------------------
+
+- Fix tests: do not import collective.volto.cookieconsent.
+  [cekk]
+
+
+6.2.20 (2024-10-17)
+-------------------
+
+- Fix upgrade step 
+  [lucabel]
 - Avoid acquisition problem in *onModify* event handler: now try to reindex children only if context is folderish.
   [cekk]
 - Add sort_on sortable_title to event_location, uo_location, ufficio_responsabile vocabularies 

diff --git a/base.cfg b/base.cfg
@@ -140,8 +140,3 @@ design.plone.contenttypes =
 plone.restapi = 
 
 [sources]
-#collective.volto.blocksfield = git https://github.com/collective/collective.volto.blocksfield.git [email protected]:collective/collective.volto.blocksfield.git branch=main
-#redturtle.volto = git https://github.com/RedTurtle/redturtle.volto.git [email protected]:RedTurtle/redturtle.volto.git
-#redturtle.bandi = git https://github.com/RedTurtle/redturtle.bandi.git [email protected]:RedTurtle/redturtle.bandi.git
-#plone.restapi = git https://github.com/plone/plone.restapi.git
-collective.volto.enhancedlinks = git https://github.com/RegioneER/collective.volto.enhancedlinks.git pushurl[email protected]:RegioneER/collective.volto.enhancedlinks.git branch=main
diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@
 
 setup(
     name="design.plone.contenttypes",
-    version="6.2.20.dev0",
+    version="6.2.22.dev0",
     description="DesignItalia contenty types",
     long_description=long_description,
     long_description_content_type="text/markdown",

diff --git a/src/design/plone/contenttypes/testing.py b/src/design/plone/contenttypes/testing.py
@@ -13,7 +13,6 @@
 # import collective.folderishtypes
 import collective.venue
 import collective.volto.blocksfield
-import collective.volto.cookieconsent
 import collective.volto.enhancedlinks
 import collective.z3cform.datagridfield
 import design.plone.contenttypes

diff --git a/src/design/plone/contenttypes/upgrades/to_730x.py b/src/design/plone/contenttypes/upgrades/to_730x.py
@@ -82,7 +82,7 @@ def to_7303(context):
 
 
 def to_7304(context):
-    brains = context.portal_catalog()
+    brains = context.portal_catalog(**{"portal_type": "Event"})
     tot = len(brains)
     i = 0
     for brain in brains: