- Update avatar version

GeoNode · Apr 26, 2018 · 32ddf3c · 32ddf3c
1 parent 4a66e08
commit 32ddf3c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/geonode/geoserver/signals.py b/geonode/geoserver/signals.py
@@ -253,7 +253,7 @@ def geoserver_post_save_local(instance, *args, **kwargs):
                 gs_catalog.save(gs_resource)
 
     if not settings.FREETEXT_KEYWORDS_READONLY:
-        if gs_resource.keywords:
+        if len(instance.keyword_list()) == 0 and gs_resource.keywords:
             for keyword in gs_resource.keywords:
                 if keyword not in instance.keyword_list():
                     instance.keywords.add(keyword)

diff --git a/geonode/layers/utils.py b/geonode/layers/utils.py
@@ -581,7 +581,7 @@ def file_upload(filename,
             layer.upload_session = upload_session
 
         # update with new information
-        db_layer = Layer.objects.filter(id=layer.id)
+        db_layer = Layer.objects.get(id=layer.id)
 
         defaults['upload_session'] = upload_session
         defaults['title'] = defaults.get('title', None) or layer.title

diff --git a/requirements.txt b/requirements.txt
@@ -106,7 +106,7 @@ django-basic-authentication-decorator==0.9 # python-django-basic-authentication-
 # GeoNode org maintained apps.
 django-geoexplorer>=4.0.0,<5.0 # python-django-geoexplorer (4.0.39 in our ppa)
 geonode-user-messages==0.1.14 # python-geonode-user-messages (0.1.14 in our ppa)
-geonode-avatar==2.1.7 # python-geonode-avatar (2.1.7 in our ppa)
+geonode-avatar==2.1.8 # python-geonode-avatar (2.1.7 in our ppa) FIXME
 geonode-announcements==1.0.13 # python-geonode-announcements (1.0.13 in our ppa)
 geonode-agon-ratings==0.3.8 # python-geonode-agon-ratings (0.3.8 in our ppa)
 arcrest>=10.0 # TODO

diff --git a/requirements_docs.txt b/requirements_docs.txt
@@ -81,7 +81,7 @@ funcsigs==1.0.2
 geolinks==0.2.0
 geonode-agon-ratings==0.3.8
 geonode-announcements==1.0.13
-geonode-avatar==2.1.7
+geonode-avatar==2.1.8
 geonode-dialogos==0.9
 geonode-user-messages==0.1.14
 gisdata==0.5.4