Merge branch 'PATCHES_OCT17_001' of https://github.com/GeoNode/geonode…

… into monitoring
GeoNode · Oct 11, 2017 · 9b391fb · 9b391fb
1 parent a58a395
commit 9b391fb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/geonode/local_settings.py.geoserver.sample b/geonode/local_settings.py.geoserver.sample
@@ -248,7 +248,6 @@ LAYER_PREVIEW_LIBRARY = 'geoext'
 #    'RESET_VIEW': False
 #}
 
-    'corsheaders',
 ALT_OSM_BASEMAPS = os.environ.get('ALT_OSM_BASEMAPS', False)
 CARTODB_BASEMAPS = os.environ.get('CARTODB_BASEMAPS', False)
 STAMEN_BASEMAPS = os.environ.get('STAMEN_BASEMAPS', False)
@@ -382,10 +381,6 @@ LOGGING = {
         },
     }
 
-MIDDLEWARE_CLASSES += (
-    'corsheaders.middleware.CorsMiddleware',
-    'django.middleware.common.CommonMiddleware',
-)
 CORS_ORIGIN_ALLOW_ALL = True
 
 GEOIP_PATH = "/usr/local/share/GeoIP"

diff --git a/geonode/settings.py b/geonode/settings.py
@@ -369,6 +369,7 @@
     'polymorphic',
     'guardian',
     'oauth2_provider',
+    'corsheaders',
 ) + GEONODE_APPS
 
 MONITORING_ENABLED = False
@@ -458,6 +459,7 @@
 ]
 
 MIDDLEWARE_CLASSES = (
+    'corsheaders.middleware.CorsMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
@@ -484,7 +486,6 @@
     'oauth2_provider.middleware.OAuth2TokenMiddleware',
 )
 
-
 # Replacement of default authentication backend in order to support
 # permissions per object.
 AUTHENTICATION_BACKENDS = (