Skip to content

Commit

Permalink
Update utils.py
Browse files Browse the repository at this point in the history
  • Loading branch information
Alessio Fabiani committed Apr 26, 2018
1 parent 7d8d53c commit b996b4b
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions geonode/layers/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -581,8 +581,6 @@ def file_upload(filename,
layer.upload_session = upload_session

# update with new information
db_layer = Layer.objects.get(id=layer.id)

defaults['upload_session'] = upload_session
defaults['title'] = defaults.get('title', None) or layer.title
defaults['abstract'] = defaults.get('abstract', None) or layer.abstract
Expand All @@ -597,9 +595,14 @@ def file_upload(filename,
defaults['license'] = defaults.get('license', None) or layer.license
defaults['category'] = defaults.get('category', None) or layer.category

db_layer.update(**defaults)
db_layer.refresh_from_db()
layer = db_layer
try:
db_layer = Layer.objects.get(id=layer.id)
Layer.objects.filter(id=layer.id).update(**defaults)
layer.refresh_from_db()
except Layer.DoesNotExist:
import traceback
tb = traceback.format_exc()
logger.error(tb)

# Pass the parameter overwrite to tell whether the
# geoserver_post_save_signal should upload the new file or not
Expand Down

0 comments on commit b996b4b

Please sign in to comment.