Fixing a couple of things broke when merging

geonode/layers/forms.py

@@ -220,9 +220,8 @@ def write_files(self):
                     with open(path, 'wb') as writable:
                         for c in f.chunks():
                             writable.write(c)
-
-        absolute_base_file = os.path.join(tempdir,
-                                          self.cleaned_data["base_file"].name)
+            absolute_base_file = os.path.join(tempdir,
+                                              self.cleaned_data["base_file"].name)
         return tempdir, absolute_base_file
 
 

geonode/layers/utils.py

@@ -397,6 +397,7 @@ def file_upload(filename,
                 metadata_upload_form=False):
     """Saves a layer in GeoNode asking as little information as possible.
        Only filename is required, user and title are optional.
+
     :return: Uploaded layer
     :rtype: Layer
     """
@@ -680,7 +681,9 @@ def upload(incoming, user=None, overwrite=False,
            private=False, metadata_uploaded_preserve=False,
            charset='UTF-8'):
     """Upload a directory of spatial data files to GeoNode
+
        This function also verifies that each layer is in GeoServer.
+
        Supported extensions are: .shp, .tif, .tar, .tar.gz, and .zip (of a shapefile).
        It catches GeoNodeExceptions and gives a report per file
     """

geonode/templates/base.html

@@ -145,7 +145,7 @@
                 <li role="separator" class="divider"></li>
                 <li><a href="{% url "admin:index" %}">Admin</a></li>
                 {% if 'geonode.geoserver' in INSTALLED_APPS %}
-                <li><a href="{% url "proxy" %}?url={{ GEOSERVER_LOCAL_URL }}web">GeoServer</a></li>
+                <li><a href="{% url "proxy" %}?url={{ GEOSERVER_BASE_URL }}web">GeoServer</a></li>
                 {% endif %}
                 {% if user.is_superuser and USE_MONITORING %}
                 <li role="separator" class="divider"></li>