Skip to content

Commit

Permalink
[Fixes #5121] ResourceBase API returns an error if a curated thumbnai…
Browse files Browse the repository at this point in the history 
…l img file is not existing anymore
  • Loading branch information
@capooti
capooti committed Oct 25, 2019
1 parent 9f4009c commit 7de17f0
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions geonode/api/resourcebase_api.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 7de17f0

Please sign in to comment.