- Test coverage improvements

GeoNode · May 7, 2018 · 27efde1 · 27efde1
1 parent bc5992a
commit 27efde1
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 11 deletions.
diff --git a/geonode/geoserver/helpers.py b/geonode/geoserver/helpers.py
@@ -902,16 +902,18 @@ def set_styles(layer, gs_catalog):
     if not gs_layer:
         gs_layer = gs_catalog.get_layer(layer.alternate)
 
-    if gs_layer and gs_layer.default_style:
-        default_style = gs_layer.default_style
-    else:
-        default_style = gs_catalog.get_style(layer.name, workspace=settings.DEFAULT_WORKSPACE) \
-                        or gs_catalog.get_style(layer.name)
-        try:
-            gs_layer.default_style = default_style
-            gs_catalog.save(gs_layer)
-        except:
-            logger.exception("GeoServer Layer Default Style issues!")
+    if gs_layer:
+        if gs_layer.default_style:
+            default_style = gs_layer.default_style
+        else:
+            default_style = gs_catalog.get_style(layer.name, workspace=settings.DEFAULT_WORKSPACE) \
+                            or gs_catalog.get_style(layer.name)
+            try:
+                gs_layer.default_style = default_style
+                gs_catalog.save(gs_layer)
+            except:
+                logger.exception("GeoServer Layer Default Style issues!")
+
     if default_style:
         layer.default_style = save_style(default_style)
         # FIXME: This should remove styles that are no longer valid
@@ -929,7 +931,9 @@ def set_styles(layer, gs_catalog):
     to_update = {
         'default_style': layer.default_style
     }
+
     Layer.objects.filter(id=layer.id).update(**to_update)
+    layer.refresh_from_db()
     return layer
 
 

diff --git a/geonode/geoserver/tests.py b/geonode/geoserver/tests.py
@@ -561,6 +561,13 @@ def test_style_manager(self):
                     layer.alternate,)))
         self.assertEqual(response.status_code, 200)
 
+        form_data = {'default_style': 'polygon'}
+        response = self.client.post(
+            reverse(
+                'layer_style_manage', args=(
+                    layer.alternate,)), data=form_data)
+        self.assertEquals(response.status_code, 302)
+
     @on_ogc_backend(geoserver.BACKEND_PACKAGE)
     def test_style_validity_and_name(self):
         # Check that including an SLD with a valid shapefile results in the SLD

diff --git a/geonode/geoserver/views.py b/geonode/geoserver/views.py
@@ -282,9 +282,13 @@ def layer_style_manage(request, layername):
         try:
             selected_styles = request.POST.getlist('style-select')
             default_style = request.POST['default_style']
+
             # Save to GeoServer
             cat = gs_catalog
             gs_layer = cat.get_layer(layer.name)
+            if not gs_layer:
+                gs_layer = cat.get_layer(layer.alternate)
+
             if gs_layer:
                 gs_layer.default_style = cat.get_style(default_style, workspace=settings.DEFAULT_WORKSPACE) or \
                     cat.get_style(default_style)
@@ -299,7 +303,6 @@ def layer_style_manage(request, layername):
 
             # Save to Django
             layer = set_styles(layer, cat)
-            layer.save()
 
             # Invalidate GeoWebCache for the updated resource
             _invalidate_geowebcache_layer(layer.alternate)