Merge branch 'nexus_master' of github.com:geosolutions-it/geonode int…

…o ISSUE_174

.env

@@ -51,7 +51,6 @@ HAYSTACK_ENGINE_URL=http://elasticsearch:9200/
 HAYSTACK_ENGINE_INDEX_NAME=haystack
 HAYSTACK_SEARCH_RESULTS_PER_PAGE=200
 
-
 # #################
 # nginx
 # HTTPD Server

.env_dev

@@ -51,7 +51,7 @@ CACHE_BUSTING_STATIC_ENABLED=False
 CACHE_BUSTING_MEDIA_ENABLED=False
 
 MEMCACHED_ENABLED=False
-MEMCACHED_BACKEND=django.core.cache.backends.memcached.MemcachedCache
+MEMCACHED_BACKEND=django.core.cache.backends.memcached.PyMemcacheCache
 MEMCACHED_LOCATION=127.0.0.1:11211
 MEMCACHED_LOCK_EXPIRE=3600
 MEMCACHED_LOCK_TIMEOUT=10

.env_test

@@ -51,7 +51,7 @@ CACHE_BUSTING_STATIC_ENABLED=False
 CACHE_BUSTING_MEDIA_ENABLED=False
 
 MEMCACHED_ENABLED=False
-MEMCACHED_BACKEND=django.core.cache.backends.memcached.MemcachedCache
+MEMCACHED_BACKEND=django.core.cache.backends.memcached.PyMemcacheCache
 MEMCACHED_LOCATION=127.0.0.1:11211
 MEMCACHED_LOCK_EXPIRE=3600
 MEMCACHED_LOCK_TIMEOUT=10

geonode/api/resourcebase_api.py

@@ -23,7 +23,7 @@
 from django.db.models import Q
 from django.http import HttpResponse
 from django.conf import settings
-from django.contrib.staticfiles.templatetags import staticfiles
+from django.templatetags.static import static
 from tastypie.authentication import MultiAuthentication, SessionAuthentication
 from tastypie.bundle import Bundle
 
@@ -574,7 +574,7 @@ def format_objects(self, objects):
                 formatted_obj['site_url'] = settings.SITEURL
 
             if formatted_obj['thumbnail_url'] and len(formatted_obj['thumbnail_url']) == 0:
-                formatted_obj['thumbnail_url'] = staticfiles.static(settings.MISSING_THUMBNAIL)
+                formatted_obj['thumbnail_url'] = static(settings.MISSING_THUMBNAIL)
 
             formatted_obj['owner__username'] = obj.owner.username
             formatted_obj['owner_name'] = obj.owner.get_full_name() or obj.owner.username

geonode/base/__init__.py

@@ -29,6 +29,3 @@ class BaseAppConfig(NotificationsAppConfigBase):
                      ("request_resource_edit", _("Request resource change"),
                       _("Owner has requested permissions to modify a resource")),
                      )
-
-
-default_app_config = 'geonode.base.BaseAppConfig'

geonode/base/management/commands/load_thesaurus.py

@@ -19,7 +19,7 @@
 #########################################################################
 
 from typing import List
-from defusedxml import lxml as dlxml
+from owslib.etree import etree as dlxml
 from django.conf import settings
 
 from django.core.management.base import BaseCommand, CommandError

geonode/base/migrations/0032_auto_20200115_1121.py

@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='curatedthumbnail',
             name='resource',
-            field=models.OneToOneField(on_delete='CASCASE', to='base.ResourceBase'),
+            field=models.OneToOneField(on_delete=models.CASCADE, to='base.ResourceBase'),
         ),
         migrations.AlterField(
             model_name='resourcebase',

geonode/base/models.py

@@ -41,7 +41,7 @@
 from django.core.exceptions import ValidationError
 from django.utils.translation import ugettext_lazy as _
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.staticfiles.templatetags import staticfiles
+from django.templatetags.static import static
 from django.core.files.storage import default_storage as storage
 from django.utils.html import strip_tags
 from mptt.models import MPTTModel, TreeForeignKey
@@ -1485,7 +1485,7 @@ def get_thumbnail_url(self):
            It could be a local one if it exists, a remote one (WMS GetImage) for example
            or a 'Missing Thumbnail' one.
         """
-        _thumbnail_url = self.thumbnail_url or staticfiles.static(settings.MISSING_THUMBNAIL)
+        _thumbnail_url = self.thumbnail_url or static(settings.MISSING_THUMBNAIL)
         local_thumbnails = self.link_set.filter(name='Thumbnail')
         remote_thumbnails = self.link_set.filter(name='Remote Thumbnail')
         if local_thumbnails.count() > 0:
@@ -1580,7 +1580,7 @@ def save_thumbnail(self, filename, image):
             logger.error(f'Check permissions for file {upload_path}.')
             try:
                 Link.objects.filter(resource=self, name='Thumbnail').delete()
-                _thumbnail_url = staticfiles.static(settings.MISSING_THUMBNAIL)
+                _thumbnail_url = static(settings.MISSING_THUMBNAIL)
                 obj, _created = Link.objects.get_or_create(
                     resource=self,
                     name='Thumbnail',

geonode/base/templates/base/batch_edit.html

@@ -1,6 +1,6 @@
 {% extends "geonode_base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load bootstrap_tags %}
 
 {% block title %} {% trans "Batch Edit" %} - {{ block.super }} {% endblock %}

geonode/base/templates/base/batch_permissions.html

@@ -1,6 +1,6 @@
 {% extends "geonode_base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load bootstrap_tags %}
 
 {% block title %} {% trans "Set Permissions" %} - {{ block.super }} {% endblock %}

geonode/base/templates/base/maintenance.html

@@ -1,4 +1,4 @@
-{% load static from staticfiles %}
+{% load static %}
 
 <!DOCTYPE html>
 <html>

geonode/base/templates/base/read_only_violation.html

@@ -1,4 +1,4 @@
-{% load static from staticfiles %}
+{% load static %}
 
 <!DOCTYPE html>
 <html>

geonode/base/templates/base/user_and_group_permissions.html

@@ -1,6 +1,6 @@
 {% extends "geonode_base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load bootstrap_tags %}
 
 {% block title %} {% trans "Batch Edit" %} - {{ block.super }} {% endblock %}

geonode/catalogue/backends/generic.py

@@ -24,9 +24,9 @@
 
 from django.conf import settings
 from django.template.loader import get_template
-from owslib.csw import CatalogueServiceWeb, namespaces
+from owslib.catalogue.csw2 import CatalogueServiceWeb, namespaces
 from owslib.util import http_post
-from defusedxml import lxml as dlxml
+from owslib.etree import etree as dlxml
 from geonode.catalogue.backends.base import BaseCatalogueBackend
 
 logger = logging.getLogger(__name__)

geonode/catalogue/backends/pycsw_local.py

@@ -19,7 +19,7 @@
 #########################################################################
 
 import os
-from defusedxml import lxml as dlxml
+from owslib.etree import etree as dlxml
 from django.conf import settings
 from owslib.iso import MD_Metadata
 from pycsw import server

geonode/catalogue/metadataxsl/views.py

@@ -22,7 +22,7 @@
 import logging
 
 from lxml import etree
-from defusedxml import lxml as dlxml
+from owslib.etree import etree as dlxml
 
 from django.shortcuts import get_object_or_404
 from django.http import HttpResponse

geonode/catalogue/models.py

@@ -23,7 +23,7 @@
 from django.conf import settings
 from django.db.models import signals
 from lxml import etree
-from defusedxml import lxml as dlxml
+from owslib.etree import etree as dlxml
 from geonode.layers.models import Layer
 from geonode.documents.models import Document
 from geonode.catalogue import get_catalogue

geonode/catalogue/templates/geonode_metadata_full.html

@@ -1,5 +1,5 @@
 {% load i18n %}
-{% load static from staticfiles %}
+{% load static %}
 
 <html>
 	<head>

geonode/client/templates/ol/layers/layer_ol2_map.html

@@ -1,5 +1,5 @@
 
-{% load static from staticfiles %}
+{% load static %}
 <!-- script src="{% static "geonode/js/proj4js/proj4.js" %}" type="text/javascript"></script -->
 <script src="{% static "geonode/js/ol-2.13/OpenLayers.js" %}" type="text/javascript"></script>
 <script src="{% static "geonode/js/ol-2.13/lib/OpenLayers/Layer/ArcGISCache.js" %}" type="text/javascript"></script>

geonode/client/templates/ol/maps/map_ol2.html

@@ -1,4 +1,4 @@
-{% load static from staticfiles %}
+{% load static %}
 <!-- script src="{% static "geonode/js/proj4js/proj4.js" %}" type="text/javascript"></script -->
 <script src="{% static "geonode/js/ol-2.13/OpenLayers.js" %}" type="text/javascript"></script>
 <script src="{% static "geonode/js/ol-2.13/lib/OpenLayers/Layer/ArcGISCache.js" %}" type="text/javascript"></script>

geonode/documents/templates/documents/document_list.html

@@ -1,6 +1,6 @@
 {% extends "documents/document_base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %} {% trans "Explore Documents" %} - {{ block.super }} {% endblock %}
 

geonode/documents/templates/documents/document_thumb_upload.html

@@ -1,5 +1,5 @@
 {% extends "documents/document_upload_base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load bootstrap_tags %}
 {% load i18n %}
 

geonode/geoapps/templates/apps/app_detail.html

@@ -1,6 +1,6 @@
 {% extends "apps/app_base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load dialogos_tags %}
 {% load pinax_ratings_tags %}
 {% load bootstrap_tags %}

geonode/geoapps/templates/apps/app_list_default.html

@@ -1,6 +1,6 @@
 {% extends "apps/app_base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block body_class %}apps explore{% endblock %}
 

geonode/geoserver/createlayer/templates/createlayer/layer_create.html

@@ -1,7 +1,7 @@
 {% extends "geonode_base.html" %}
 {% load i18n %}
 {% load base_tags %}
-{% load staticfiles %}
+{% load static %}
 {% load bootstrap_tags %}
 
 {% block title %} {% trans "Create Layer"  %} - {{ block.super }}  {% endblock %}

geonode/geoserver/helpers.py

@@ -54,7 +54,7 @@
 from geoserver.workspace import Workspace
 from gsimporter import Client
 from lxml import etree
-from defusedxml import lxml as dlxml
+from owslib.etree import etree as dlxml
 from owslib.wcs import WebCoverageService
 from owslib.wms import WebMapService
 from geonode import GeoNodeException

geonode/geoserver/signals.py

@@ -25,7 +25,8 @@
 from django.conf import settings
 from django.dispatch import receiver, Signal
 from django.forms.models import model_to_dict
-from django.contrib.staticfiles.templatetags import staticfiles
+from django.templatetags.static import static
+
 
 # use different name to avoid module clash
 from geonode.utils import (
@@ -130,7 +131,7 @@ def geoserver_post_save_map(instance, sender, created, **kwargs):
     instance.set_missing_info()
     if not created:
         if not instance.thumbnail_url or \
-                instance.thumbnail_url == staticfiles.static(settings.MISSING_THUMBNAIL):
+                instance.thumbnail_url == static(settings.MISSING_THUMBNAIL):
             logger.debug(f"... Creating Thumbnail for Map [{instance.title}]")
             # create_gs_thumbnail(instance, overwrite=False, check_bbox=True)
             geoserver_create_thumbnail.apply_async(((instance.id, False, True, )))
@@ -149,7 +150,7 @@ def geoserver_post_save_thumbnail(sender, instance, **kwargs):
                 'thumbnail_url' in kwargs['update_fields']:
             _recreate_thumbnail = True
         if not instance.thumbnail_url or \
-                instance.thumbnail_url == staticfiles.static(settings.MISSING_THUMBNAIL) or \
+                instance.thumbnail_url == static(settings.MISSING_THUMBNAIL) or \
                 is_monochromatic_image(instance.thumbnail_url):
             _recreate_thumbnail = True
         if _recreate_thumbnail:

geonode/geoserver/tasks.py

@@ -26,7 +26,8 @@
 from django.contrib.auth import get_user_model
 from django.core.management import call_command
 from django.utils.translation import ugettext_lazy as _
-from django.contrib.staticfiles.templatetags import staticfiles
+from django.templatetags.static import static
+
 
 from celery.utils.log import get_task_logger
 
@@ -485,7 +486,7 @@ def geoserver_post_save_layers(
                 }
 
                 if is_monochromatic_image(instance.thumbnail_url):
-                    to_update['thumbnail_url'] = staticfiles.static(settings.MISSING_THUMBNAIL)
+                    to_update['thumbnail_url'] = static(settings.MISSING_THUMBNAIL)
 
                 # Save all the modified information in the instance without triggering signals.
                 try:

geonode/geoserver/tests/integration.py

@@ -27,7 +27,7 @@
 import gisdata
 import logging
 from lxml import etree
-from defusedxml import lxml as dlxml
+from owslib.etree import etree as dlxml
 from urllib.request import urlopen, Request
 from urllib.parse import urljoin
 

geonode/geoserver/views.py

@@ -24,7 +24,7 @@
 import logging
 import traceback
 from lxml import etree
-from defusedxml import lxml as dlxml
+from owslib.etree import etree as dlxml
 from os.path import isfile
 
 from urllib.parse import (

geonode/groups/migrations/0029_auto_20200115_1121.py

@@ -13,6 +13,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='groupprofile',
             name='group',
-            field=models.OneToOneField(on_delete='CASCASE', to='auth.Group'),
+            field=models.OneToOneField(on_delete=models.CASCADE, to='auth.Group'),
         ),
     ]

geonode/groups/models.py

@@ -31,7 +31,9 @@
 from django.utils.text import slugify
 from django.db.models import signals
 from django.utils.timezone import now
-from django.contrib.staticfiles.templatetags import staticfiles
+
+from django.templatetags.static import static
+
 
 from taggit.managers import TaggableManager
 
@@ -226,7 +228,7 @@ def class_name(self):
 
     @property
     def logo_url(self):
-        _missing_thumbnail_url = staticfiles.static(settings.MISSING_THUMBNAIL)
+        _missing_thumbnail_url = static(settings.MISSING_THUMBNAIL)
         try:
             _base_path = os.path.split(self.logo.path)[0]
             _upload_path = os.path.split(self.logo.url)[1]

geonode/groups/templates/groups/category_list.html

@@ -1,6 +1,6 @@
 {% extends "groups/group_base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %} {% trans "Explore Group Categories" %} - {{ block.super }} {% endblock %}
 

geonode/groups/templates/groups/group_list.html

@@ -1,6 +1,6 @@
 {% extends "groups/group_base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %} {% trans "Explore Groups" %} - {{ block.super }} {% endblock %}
 

geonode/layers/api/serializers.py

@@ -19,6 +19,10 @@
 #########################################################################
 from rest_framework import serializers
 
+from urllib.parse import urlparse
+
+from django.conf import settings
+
 from dynamic_rest.serializers import DynamicModelSerializer
 from dynamic_rest.fields.fields import DynamicRelationField
 
@@ -41,6 +45,15 @@ class Meta:
 
     name = serializers.CharField(read_only=True)
     workspace = serializers.CharField(read_only=True)
+    sld_url = serializers.SerializerMethodField()
+
+    def get_sld_url(self, instance):
+        if bool(urlparse(instance.sld_url).netloc):
+            return instance.sld_url.replace(
+                settings.OGC_SERVER['default']['LOCATION'],
+                settings.OGC_SERVER['default']['PUBLIC_LOCATION']
+            )
+        return instance.sld_url
 
 
 class AttributeSerializer(DynamicModelSerializer):

geonode/layers/metadata.py

@@ -24,7 +24,7 @@
 import uuid
 import logging
 import datetime
-from defusedxml import lxml as dlxml
+from owslib.etree import etree as dlxml
 from django.conf import settings
 
 # Geonode functionality

geonode/layers/templates/layers/layer_append.html

@@ -1,6 +1,6 @@
 {% extends "upload/layer_upload_base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load dialogos_tags %}
 {% load pinax_ratings_tags %}
 {% load bootstrap_tags %}