Merge branch 'master' into gdprcookie

CHANGES.rst

@@ -4,10 +4,14 @@ Changelog
 5.4.9 (unreleased)
 ------------------
 
+- Limit event occurrences to 100.
+  [mamico]
 - Customize INameChooser adapter to check also alias ids and disallow to create contents that could override aliases.
   [cekk]
 - Add flag in controlpanel to enable/disable INameChooser customization.
   [cekk]
+- Exclude bg_color from transformed fields in deserializer.
+  [cekk]
 - Uninstall collective.volto.cookieconsent (deprecated). Will be removed from dependencies in next releases.
   [cekk]
 - Add dependency to collective.volto.gdprcookie and install it by default.

src/redturtle/volto/monkey.py

@@ -14,9 +14,13 @@
 from zope.globalrequest import getRequest
 
 import datetime
+import logging
 import os
 
 
+logger = logging.getLogger(__name__)
+
+
 def occurrences(self, range_start=None, range_end=None):
     """Return all occurrences of an event, possibly within a start and end
     limit.
@@ -94,7 +98,15 @@ def get_obj(start):
             id=str(start.date()), start=start, end=start + duration
         ).__of__(self.context)
 
+    limit = 100
     for start in starts:
+        if limit < 0:
+            logger.warning(
+                "Too many occurrences for %s, stopping at 100",
+                self.context.absolute_url(),
+            )
+            raise StopIteration
+        limit -= 1
         yield get_obj(start)
 
 

src/redturtle/volto/restapi/deserializer/blocks.py

@@ -9,8 +9,14 @@
 from zope.interface import implementer
 
 
-EXCLUDE_KEYS = ["@type", "token", "value", "@id", "query"]
-EXCLUDE_TYPES = ["title", "listing", "calendar", "searchEvents", "form"]
+EXCLUDE_KEYS = ["@type", "token", "value", "@id", "query", "bg_color"]
+EXCLUDE_TYPES = [
+    "title",
+    "listing",
+    "calendar",
+    "searchEvents",
+    "form",
+]
 
 
 class GenericResolveUIDDeserializer(object):

src/redturtle/volto/restapi/serializer/blocks.py

@@ -13,8 +13,14 @@
 from zope.interface import implementer
 
 
-EXCLUDE_KEYS = ["@type"]
-EXCLUDE_TYPES = ["title", "listing", "form"]
+EXCLUDE_KEYS = ["@type", "token", "value", "@id", "query", "bg_color"]
+EXCLUDE_TYPES = [
+    "title",
+    "listing",
+    "calendar",
+    "searchEvents",
+    "form",
+]
 
 
 class GenericResolveUIDSerializer(object):