Merge branch 'master' into email_vars_extend

.coveragerc

@@ -5,8 +5,6 @@ relative_files = True
 include =
     */src/design/plone/ioprenoto/*
 omit =
-    .tox/
-    eggs/
-    test/
-    upgrades/
-    extras/
+    */test*
+    */upgrades/*
+    */upgrades.py

CHANGES.rst

@@ -4,6 +4,9 @@ Changelog
 1.1.11 (unreleased)
 -------------------
 
+- Handle missing infos in prenotazioniFolder serializer.
+  [cekk]
+
 - Compatibilize with the 2.0.1 redturtle.prenotazioni version.
   [folix-01]
 - Add the UO.contact_info field to @bookable-uo-list response.

src/design/plone/ioprenoto/restapi/serializers/ovverrides/prenotazioniFolder.py

@@ -26,11 +26,11 @@ def __call__(self, *args, **kwargs):
         ):
             # XXX: this is a workaround to avoid the Unauthorized exception
             return {
-                "@components": resp["@components"],
-                "@id": resp["@id"],
-                "@type": resp["@type"],
-                "layout": resp["layout"],
-                "title": resp["title"],
+                "@components": resp.get("@components", {}),
+                "@id": resp.get("@id", ""),
+                "@type": resp.get("@type", ""),
+                "layout": resp.get("@layout", ""),
+                "title": resp.get("@title", ""),
                 "error": "Unauthorized",
                 "anonymous": api.user.is_anonymous(),
             }

src/design/plone/ioprenoto/tests/test_prenotazione_add.py

@@ -30,17 +30,15 @@ def setUp(self):
             row["morning_start"] = "0700"
             row["morning_end"] = "1000"
         self.folder_prenotazioni.week_table = week_table
-        api.content.transition(
-            obj=api.content.create(
-                type="PrenotazioneType",
-                title="Type A",
-                duration=30,
-                container=self.folder_prenotazioni,
-                gates=["all"],
-            ),
-            transition="publish",
+        booking_type_a = api.content.create(
+            type="PrenotazioneType",
+            title="Type A",
+            duration=30,
+            container=self.folder_prenotazioni,
+            gates=["all"],
         )
         api.content.transition(obj=self.folder_prenotazioni, transition="publish")
+        api.content.transition(obj=booking_type_a, transition="publish")
         transaction.commit()
 
         self.api_session = RelativeSession(self.portal_url)

tox.ini

@@ -6,17 +6,6 @@ skip_missing_interpreters = True
 [coverage:run]
 relative_files = True
 
-[coverage:report]
-include =
-    */src/design/plone/ioprenoto/*
-
-omit =
-    .tox/
-    eggs/
-    test/
-    upgrades/
-    extras/
-
 [testenv]
 skip_install = true
 extras =