Merge branch 'main' into bug_52791_change_news_type

CHANGES.rst

@@ -1,13 +1,22 @@
 Changelog
 =========
 
-6.2.6 (unreleased)
+6.2.7 (unreleased)
 ------------------
 
 - Fix change_news_type view; Taxonomy doesn't index values not present in
   the taxonomy vocabulary, so we had lot of old values not indexed and not listed
   as available type to change.
   [lucabel]
+- Do not break News serialzier if `tipologia_notizia` attribute is missing.
+  [cekk]
+
+
+6.2.6 (2024-04-18)
+------------------
+
+- improved check on relation.
+  [daniele]
 
 
 6.2.5 (2024-04-17)

setup.py

@@ -16,7 +16,7 @@
 
 setup(
     name="design.plone.contenttypes",
-    version="6.2.6.dev0",
+    version="6.2.7.dev0",
     description="DesignItalia contenty types",
     long_description=long_description,
     long_description_content_type="text/markdown",

src/design/plone/contenttypes/patches/baseserializer.py

@@ -37,7 +37,7 @@ def design_italia_serialize_to_json_call(self, version=None, include_items=True)
         ttool[self.context.portal_type].Title(), context=self.request
     )
     if self.context.portal_type == "News Item":
-        if self.context.tipologia_notizia:
+        if getattr(self.context, "tipologia_notizia", ""):
             taxonomy = getUtility(
                 ITaxonomy, name="collective.taxonomy.tipologia_notizia"
             )

src/design/plone/contenttypes/restapi/serializers/dxcontent.py

@@ -19,15 +19,16 @@
 class MetaTypeSerializer(object):
     def get_design_meta_type(self):
         ttool = api.portal.get_tool("portal_types")
-        if self.context.portal_type == "News Item" and self.context.tipologia_notizia:
+        tipologia_notizia = getattr(self.context, "tipologia_notizia", "")
+        if self.context.portal_type == "News Item" and tipologia_notizia:
             taxonomy = getUtility(
                 ITaxonomy, name="collective.taxonomy.tipologia_notizia"
             )
             taxonomy_voc = taxonomy.makeVocabulary(self.request.get("LANGUAGE"))
-            if isinstance(self.context.tipologia_notizia, list):
-                token = self.context.tipologia_notizia[0]
+            if isinstance(tipologia_notizia, list):
+                token = tipologia_notizia[0]
             else:
-                token = self.context.tipologia_notizia
+                token = tipologia_notizia
             title = taxonomy_voc.inv_data.get(token, None)
 
             if title and title.startswith(PATH_SEPARATOR):

src/design/plone/contenttypes/restapi/serializers/punto_di_contatto.py

@@ -61,7 +61,10 @@ def related_contents(self, field, portal_type):
         )
 
         for rel in relations:
-            obj = intids.queryObject(rel.from_id)
+            try:
+                obj = intids.queryObject(rel.from_id)
+            except:  # noqa
+                continue
             if (
                 obj is not None
                 and checkPermission("zope2.View", obj)

src/design/plone/contenttypes/restapi/serializers/summary.py

@@ -220,15 +220,16 @@ def is_get_call(self):
     def get_design_meta_type(self):
         ttool = api.portal.get_tool("portal_types")
         if self.context.portal_type == "News Item":
-            if self.context.tipologia_notizia:
+            tipologia_notizia = getattr(self.context, "tipologia_notizia", "")
+            if tipologia_notizia:
                 taxonomy = getUtility(
                     ITaxonomy, name="collective.taxonomy.tipologia_notizia"
                 )
                 taxonomy_voc = taxonomy.makeVocabulary(self.request.get("LANGUAGE"))
-                if isinstance(self.context.tipologia_notizia, list):
-                    token = self.context.tipologia_notizia[0]
+                if isinstance(tipologia_notizia, list):
+                    token = tipologia_notizia[0]
                 else:
-                    token = self.context.tipologia_notizia
+                    token = tipologia_notizia
                 title = taxonomy_voc.inv_data.get(token, None)
                 if title:
                     if title.startswith(PATH_SEPARATOR):