Merge branch 'master' into bionic

GeotrekCE · Apr 30, 2018 · 29a690e · 29a690e
2 parents 95a6d59 + 61d2266
commit 29a690e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -8,6 +8,7 @@ CHANGELOG
 **Bug fixes**
 
 * Fix sync of deleted sensitive areas
+* Fix touristiccontents.geojson crash when reservation_system is None
 
 
 2.18.3 (2018-04-27)

diff --git a/geotrek/tourism/serializers.py b/geotrek/tourism/serializers.py
@@ -73,7 +73,7 @@ class TouristicContentSerializer(PicturesSerializerMixin, PublishableSerializerM
     type2 = TouristicContentTypeSerializer(many=True)
     source = RecordSourceSerializer(many=True)
     portal = TargetPortalSerializer(many=True)
-    reservation_system = rest_serializers.ReadOnlyField(source='reservation_system.name')
+    reservation_system = rest_serializers.ReadOnlyField(source='reservation_system.name', default="")
 
     # Nearby
     touristic_contents = CloseTouristicContentSerializer(many=True, source='published_touristic_contents')