Skip to content

Commit

Permalink
Merge pull request #5122 from capooti/issue-5121
Browse files Browse the repository at this point in the history
[Fixes #5121] ResourceBase API returns an error if a curated thumbnail img file is not existing anymore
  • Loading branch information
Alessio Fabiani authored Oct 26, 2019
2 parents 9f4009c + 7de17f0 commit e866002
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions geonode/api/resourcebase_api.py
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 e866002

Please sign in to comment.