Merge pull request #5125 from GeoNode/backport-5122-to-2.10.x

[Backport 2.10.x] [Fixes #5121] ResourceBase API returns an error if a curated thumbnail img file is not existing anymore
GeoNode · Oct 26, 2019 · 1ef9586 · 1ef9586
2 parents 78a7daf + 262bb59
commit 1ef9586
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/geonode/api/resourcebase_api.py b/geonode/api/resourcebase_api.py
@@ -606,7 +606,10 @@ def format_objects(self, objects):
 
             # replace thumbnail_url with curated_thumbs
             if hasattr(obj, 'curatedthumbnail'):
-                formatted_obj['thumbnail_url'] = obj.curatedthumbnail.img_thumbnail.url
+                if hasattr(obj.curatedthumbnail.img_thumbnail, 'url'):
+                    formatted_obj['thumbnail_url'] = obj.curatedthumbnail.img_thumbnail.url
+                else:
+                    formatted_obj['thumbnail_url'] = ''
 
             formatted_objects.append(formatted_obj)
 
@@ -992,7 +995,10 @@ def format_objects(self, objects):
 
             # replace thumbnail_url with curated_thumbs
             if hasattr(obj, 'curatedthumbnail'):
-                formatted_obj['thumbnail_url'] = obj.curatedthumbnail.img_thumbnail.url
+                if hasattr(obj.curatedthumbnail.img_thumbnail, 'url'):
+                    formatted_obj['thumbnail_url'] = obj.curatedthumbnail.img_thumbnail.url
+                else:
+                    formatted_obj['thumbnail_url'] = ''
 
             formatted_objects.append(formatted_obj)
         return formatted_objects
@@ -1046,7 +1052,10 @@ def format_objects(self, objects):
 
             # replace thumbnail_url with curated_thumbs
             if hasattr(obj, 'curatedthumbnail'):
-                formatted_obj['thumbnail_url'] = obj.curatedthumbnail.img_thumbnail.url
+                if hasattr(obj.curatedthumbnail.img_thumbnail, 'url'):
+                    formatted_obj['thumbnail_url'] = obj.curatedthumbnail.img_thumbnail.url
+                else:
+                    formatted_obj['thumbnail_url'] = ''
 
             formatted_objects.append(formatted_obj)
         return formatted_objects