Merge branch 'master' into feat/add_circulation_model

GeotrekCE · Oct 23, 2023 · 3450711 · 3450711
2 parents 94ffde9 + ed76b17
commit 3450711
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -10,6 +10,11 @@ CHANGELOG
 
 - Land: Add ``CirculationEdge`` model to manage circulation types and authorization types in the land module (#3578)
 
+**Bug fixes**
+
+- Fix `sync_rando` admin command failure if Trek has SVG attachment (#3803)
+
+
 2.101.2 (2023-10-17)
 ------------------------
 

diff --git a/geotrek/common/mixins/models.py b/geotrek/common/mixins/models.py
@@ -16,6 +16,7 @@
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 from easy_thumbnails.alias import aliases
+from easy_thumbnails.engine import NoSourceGenerator
 from easy_thumbnails.exceptions import InvalidImageFormatError
 from easy_thumbnails.files import get_thumbnailer
 from embed_video.backends import detect_backend, VideoDoesntExistException
@@ -153,7 +154,7 @@ def resized_pictures(self):
                                                })
 
                 thdetail = thumbnailer.get_thumbnail(ali)
-            except (IOError, InvalidImageFormatError, DecompressionBombError) as e:
+            except (IOError, InvalidImageFormatError, DecompressionBombError, NoSourceGenerator) as e:
                 logger.info(_("Image {} invalid or missing from disk: {}.").format(picture.attachment_file, e))
             else:
                 resized.append((picture, thdetail))
@@ -445,7 +446,7 @@ def get_uuid_duplication(uid_field):
 class GeotrekMapEntityMixin(MapEntityMixin):
     elements_duplication = {
         "attachments": {"uuid": get_uuid_duplication},
-        "avoid_fields": ["aggregations", "children",],
+        "avoid_fields": ["aggregations", "children"],
         "uuid": get_uuid_duplication,
     }