- View Layer should not behave as Edit Layer

GeoNode · Nov 29, 2018 · c171816 · c171816
1 parent a2f0878
commit c171816
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 29 deletions.
diff --git a/geonode/layers/templates/layers/layer_detail.html b/geonode/layers/templates/layers/layer_detail.html
@@ -494,7 +494,7 @@ <h4>{% trans "Layer" %}</h4>
                 {% if "change_resourcebase" in perms_list and resource.storeType != "remoteStore" %}
                 <a class="btn btn-default btn-block btn-xs" href="{% url "layer_replace" resource.service_typename %}">{% trans "Replace" %}</a>
                 {% endif %}
-                {% if resource.storeType == 'dataStore' and "change_layer_data" in layer_perms and OGC_SERVER.default.BACKEND == 'geonode.geoserver' %}
+                {% if "change_layer_data" in layer_perms and OGC_SERVER.default.BACKEND == 'geonode.geoserver' %}
                 <a class="btn btn-default btn-block btn-xs" href="{% url "new_map" %}?layer={{resource.service_typename}}&storeType={{resource.storeType}}">{% trans "Edit data" %}</a>
                 {% endif %}
                 {% if "delete_resourcebase" in perms_list %}
@@ -513,7 +513,7 @@ <h4>{% trans "Layer" %}</h4>
     {% endif %}
 
     <li class="list-group-item">
-      <a href="{% url "new_map" %}?layer={{resource.service_typename}}&storeType={{resource.storeType}}" class="btn btn-default btn-md btn-block">{% trans "View Layer" %}</a>
+      <a href="{% url "new_map" %}?layer={{resource.service_typename}}&view=True" class="btn btn-default btn-md btn-block">{% trans "View Layer" %}</a>
     </li>
 
     <li class="list-group-item">

diff --git a/geonode/local_settings.py.geoserver.sample b/geonode/local_settings.py.geoserver.sample
@@ -308,33 +308,6 @@ DEFAULT_MS2_BACKGROUNDS = [{
         "title": "MapQuest OSM",
         "type": "mapquest",
         "visibility": False
-    },
-    {
-        "type": "wms",
-        "url": "https://demo.geo-solutions.it/geoserver/wms",
-        "visibility": False,
-        "title": "Natural Earth",
-        "name": "sde:NE2_HR_LC_SR_W_DR",
-        "group": "background",
-        "format": "image/png"
-    },
-    {
-        "type": "wms",
-        "url": "https://demo.geo-solutions.it/geoserver/wms",
-        "visibility": False,
-        "title": "Hypsometric",
-        "name": "sde:HYP_HR_SR_OB_DR",
-        "group": "background",
-        "format": "image/png"
-    },
-    {
-        "type": "wms",
-        "url": "https://demo.geo-solutions.it/geoserver/wms",
-        "visibility": False,
-        "title": "Gray Earth",
-        "name": "sde:GRAY_HR_SR_OB_DR",
-        "group": "background",
-        "format": "image/png"
     }
 ]