diff --git a/CHANGES.rst b/CHANGES.rst
index 670158d3..ae5713f6 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,13 +1,22 @@
Changelog
=========
-6.2.25 (unreleased)
--------------------
+6.3.1 (unreleased)
+------------------
- Update it translations
[lucabel]
+6.3.0 (2024-12-05)
+------------------
+
+- Add dependency with collective.volto.blocksfield >= 2.2.0 and install it to have all blocks indexed in block_types index.
+ [cekk]
+- Do not use eea.api.taxonomy because it is deprecated.
+ [cekk]
+
+
6.2.24 (2024-11-26)
-------------------
diff --git a/setup.py b/setup.py
index 9bedaf60..d51c8b9c 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@
setup(
name="design.plone.contenttypes",
- version="6.2.25.dev0",
+ version="6.3.1.dev0",
description="DesignItalia contenty types",
long_description=long_description,
long_description_content_type="text/markdown",
@@ -58,14 +58,14 @@
"plone.api>=1.8.4",
"plone.app.dexterity>2.6.9",
"collective.venue[geolocation]",
- "collective.volto.blocksfield",
+ "collective.volto.blocksfield>=2.2.0",
"collective.z3cform.datagridfield",
"plone.formwidget.geolocation",
"redturtle.volto>=5.5.3",
"redturtle.bandi",
"z3c.unconfigure",
"plone.restapi",
- "eea.api.taxonomy",
+ "collective.taxonomy>=3.1",
"openpyxl",
"collective.volto.enhancedlinks",
],
diff --git a/src/design/plone/contenttypes/browser/bando.py b/src/design/plone/contenttypes/browser/bando.py
index 8af4dc43..7d8cec2e 100644
--- a/src/design/plone/contenttypes/browser/bando.py
+++ b/src/design/plone/contenttypes/browser/bando.py
@@ -34,7 +34,6 @@
@implementer(IBandoView)
class BandoView(BaseBandoView):
-
def retrieveContentsOfFolderDeepening(self, path_dfolder):
"""Retrieves all objects contained in Folder Deppening"""
diff --git a/src/design/plone/contenttypes/configure.zcml b/src/design/plone/contenttypes/configure.zcml
index 715b8049..8c7b867b 100644
--- a/src/design/plone/contenttypes/configure.zcml
+++ b/src/design/plone/contenttypes/configure.zcml
@@ -65,6 +65,13 @@
directory="profiles/fix_syndication"
/>
+
+
diff --git a/src/design/plone/contenttypes/patches/configure.zcml b/src/design/plone/contenttypes/patches/configure.zcml
index 09da7b3f..8258e0e8 100644
--- a/src/design/plone/contenttypes/patches/configure.zcml
+++ b/src/design/plone/contenttypes/patches/configure.zcml
@@ -6,13 +6,4 @@
-
-
diff --git a/src/design/plone/contenttypes/patches/patches.py b/src/design/plone/contenttypes/patches/patches.py
index beec5fcd..40a96afc 100644
--- a/src/design/plone/contenttypes/patches/patches.py
+++ b/src/design/plone/contenttypes/patches/patches.py
@@ -1,11 +1 @@
# -*- coding: utf-8 -*-
-from collective.taxonomy.vocabulary import Vocabulary
-
-
-def eea_api_taxonomy_taxonomy_call(self, context):
- if not self.data:
- return Vocabulary(self.name, {}, {}, {}, 2)
-
- request = getattr(context, "REQUEST", None)
- language = self.getCurrentLanguage(request)
- return self.makeVocabulary(language)
diff --git a/src/design/plone/contenttypes/profiles/default/metadata.xml b/src/design/plone/contenttypes/profiles/default/metadata.xml
index ac3691e3..af246972 100644
--- a/src/design/plone/contenttypes/profiles/default/metadata.xml
+++ b/src/design/plone/contenttypes/profiles/default/metadata.xml
@@ -1,13 +1,14 @@
- 7308
+ 7309
profile-redturtle.bandi:default
profile-collective.venue:default
profile-redturtle.volto:default
- profile-eea.api.taxonomy:default
profile-collective.z3cform.datagridfield:default
profile-design.plone.contenttypes:taxonomy
profile-collective.volto.enhancedlinks:default
+ profile-collective.volto.blocksfield:default
+ profile-collective.taxonomy:default
diff --git a/src/design/plone/contenttypes/profiles/remove_eea_api_taxonomy/browserlayer.xml b/src/design/plone/contenttypes/profiles/remove_eea_api_taxonomy/browserlayer.xml
new file mode 100644
index 00000000..ab11dda3
--- /dev/null
+++ b/src/design/plone/contenttypes/profiles/remove_eea_api_taxonomy/browserlayer.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/src/design/plone/contenttypes/restapi/serializers/dxfields.py b/src/design/plone/contenttypes/restapi/serializers/dxfields.py
index 14af90dd..25cec6ec 100644
--- a/src/design/plone/contenttypes/restapi/serializers/dxfields.py
+++ b/src/design/plone/contenttypes/restapi/serializers/dxfields.py
@@ -189,7 +189,6 @@ def get_item_children(item):
@adapter(ITextLine, IServizio, IDesignPloneContenttypesLayer)
class ServizioTextLineFieldSerializer(DefaultFieldSerializer):
-
PERMISSION_TO_CHECK = "View"
CHECK_CONTENT_TYPE = None
diff --git a/src/design/plone/contenttypes/testing.py b/src/design/plone/contenttypes/testing.py
index 55166081..eaaff1ad 100644
--- a/src/design/plone/contenttypes/testing.py
+++ b/src/design/plone/contenttypes/testing.py
@@ -16,7 +16,6 @@
import collective.volto.enhancedlinks
import collective.z3cform.datagridfield
import design.plone.contenttypes
-import eea.api.taxonomy
import kitconcept.seo
import plone.app.caching
import plone.formwidget.geolocation
@@ -43,7 +42,6 @@ def setUpZope(self, app, configurationContext):
)
self.loadZCML(package=redturtle.bandi)
self.loadZCML(package=kitconcept.seo)
- self.loadZCML(package=eea.api.taxonomy)
self.loadZCML(package=collective.taxonomy)
self.loadZCML(package=collective.z3cform.datagridfield)
@@ -75,7 +73,6 @@ def setUpZope(self, app, configurationContext):
self.loadZCML(package=collective.volto.enhancedlinks)
self.loadZCML(package=design.plone.contenttypes, context=configurationContext)
self.loadZCML(package=plone.formwidget.geolocation)
- self.loadZCML(package=eea.api.taxonomy)
self.loadZCML(package=collective.taxonomy)
self.loadZCML(package=collective.z3cform.datagridfield)
xmlconfig.file(
diff --git a/src/design/plone/contenttypes/upgrades/configure.zcml b/src/design/plone/contenttypes/upgrades/configure.zcml
index 05268fd6..7000830a 100644
--- a/src/design/plone/contenttypes/upgrades/configure.zcml
+++ b/src/design/plone/contenttypes/upgrades/configure.zcml
@@ -912,4 +912,13 @@
destination="7308"
handler=".to_730x.to_7308"
/>
+
+
+
diff --git a/src/design/plone/contenttypes/upgrades/to_730x.py b/src/design/plone/contenttypes/upgrades/to_730x.py
index ed67eefb..07d74d2b 100644
--- a/src/design/plone/contenttypes/upgrades/to_730x.py
+++ b/src/design/plone/contenttypes/upgrades/to_730x.py
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
+from plone.app.upgrade.utils import installOrReinstallProduct
from design.plone.contenttypes.events.common import SUBFOLDERS_MAPPING
from design.plone.contenttypes.utils import create_default_blocks
from plone import api
@@ -158,3 +159,14 @@ def to_7308(context):
if i % 15 == 0:
logger.info("Progress: {}/{}".format(i, tot))
brain.getObject().reindexObject(idxs=["effectivestart"])
+
+
+def to_7309(context):
+ logger.info("Uninstall eea.api.taxonomy")
+ ps = api.portal.get_tool(name="portal_setup")
+ ps.runAllImportStepsFromProfile(
+ "profile-design.plone.contenttypes:remove_eea_api_taxonomy"
+ )
+ ps.unsetLastVersionForProfile("eea.api.taxonomy:default")
+ logger.info("Install blocksfield")
+ installOrReinstallProduct(api.portal.get(), "collective.volto.blocksfield")
diff --git a/test-6.0.x.cfg b/test-6.0.x.cfg
index e7455034..fae277e8 100644
--- a/test-6.0.x.cfg
+++ b/test-6.0.x.cfg
@@ -6,3 +6,5 @@ extends =
base.cfg
[versions]
+collective.volto.blocksfield = 2.2.0
+collective.taxonomy = 3.1.5
\ No newline at end of file