[Fixes #4025] Regression with uploading a shapefile with no ascii cha…

…racters
GeoNode · Oct 30, 2018 · ffad0fc · ffad0fc
1 parent 79465f5
commit ffad0fc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/geonode/geoserver/helpers.py b/geonode/geoserver/helpers.py
@@ -299,7 +299,7 @@ def fixup_style(cat, resource, style):
     for lyr in layers:
         if lyr.default_style.name in _style_templates:
             logger.info("%s uses a default style, generating a new one", lyr)
-            name = _style_name(resource)
+            name = _style_name(lyr)
             if style is None:
                 sld = get_sld_for(cat, lyr)
             else:

diff --git a/geonode/geoserver/views.py b/geonode/geoserver/views.py
@@ -519,7 +519,7 @@ def strip_prefix(path, prefix):
                 logger.info(
                     "[geoserver_proxy] Updating Style to ---> url %s" %
                     url.geturl())
-                affected_layers = style_update(request, url.geturl())
+                affected_layers = style_update(request, raw_url)
 
     kwargs = {'affected_layers': affected_layers}
     return proxy(request, url=raw_url, response_callback=_response_callback, **kwargs)

diff --git a/geonode/tests/bdd/e2e/conftest.py b/geonode/tests/bdd/e2e/conftest.py
@@ -23,7 +23,7 @@
 from urlparse import urljoin
 
 import pytest
-from geonode import settings as gn_settings
+# from geonode import settings as gn_settings
 from geonode.tests.bdd import __file__ as bdd_path
 from splinter import Browser
 
@@ -41,7 +41,7 @@ def en_browser(browser, bdd_server):
     """Browser login page from live server."""
     browser = Browser('phantomjs')
     en_browser = browser
-    en_browser.visit(urljoin(bdd_server.url, gn_settings.LOGIN_URL))
+    en_browser.visit(urljoin(bdd_server.url, '/account/login/'))
     yield en_browser
     try:
         # kill the specific phantomjs child proc