Backporting Master PRs

geonode/api/resourcebase_api.py

@@ -746,7 +746,10 @@ def format_objects(self, objects):
             if hasattr(obj, 'storeType'):
                 formatted_obj['store_type'] = obj.storeType
                 if obj.storeType == 'remoteStore' and hasattr(obj, 'remote_service'):
-                    formatted_obj['online'] = (obj.remote_service.probe == 200)
+                    if obj.remote_service:
+                        formatted_obj['online'] = (obj.remote_service.probe == 200)
+                    else:
+                        formatted_obj['online'] = False
 
             formatted_obj['gtype'] = self.dehydrate_gtype(bundle)
 

geonode/apps.py

@@ -22,10 +22,9 @@
 
 def run_setup_hooks(*args, **kwargs):
     from django.conf import settings
-    # from .celery_app import app as celery_app
+    from .celery_app import app as celery_app
     if 'celery_app' not in settings.INSTALLED_APPS:
-        # settings.INSTALLED_APPS += (celery_app, )
-        settings.INSTALLED_APPS += ('celery_app', )
+        settings.INSTALLED_APPS += (celery_app, )
 
 
 class AppConfig(BaseAppConfig):

geonode/maps/qgis_server_views.py

@@ -199,7 +199,7 @@ def get_context_data(self, **kwargs):
                             visibility=True
                         )
 
-                if bbox is not None:
+                if bbox and len(bbox) >= 4:
                     minx, miny, maxx, maxy = [float(coord) for coord in bbox]
                     x = (minx + maxx) / 2
                     y = (miny + maxy) / 2

geonode/maps/views.py

@@ -462,7 +462,7 @@ def map_embed_widget(request, mapid,
     else:
         map_bbox = llbbox_to_mercator([float(coord) for coord in map_bbox])
 
-    if map_bbox is not None:
+    if map_bbox and len(map_bbox) >= 4:
         minx, miny, maxx, maxy = [float(coord) for coord in map_bbox]
         x = (minx + maxx) / 2
         y = (miny + maxy) / 2
@@ -1022,7 +1022,7 @@ def sld_definition(style):
 
         layers.append(maplayer)
 
-    if bbox is not None:
+    if bbox and len(bbox) >= 4:
         minx, maxx, miny, maxy = [float(coord) for coord in bbox]
         x = (minx + maxx) / 2
         y = (miny + maxy) / 2

geonode/proxy/views.py

@@ -191,7 +191,6 @@ def proxy(request, url=None, response_callback=None,
         conn = HTTPSConnection(url.hostname, url.port)
     else:
         conn = HTTPConnection(url.hostname, url.port)
-
     conn.request(request.method, locator.encode('utf8'), request.body, headers)
     response = conn.getresponse()
     content = response.read()

geonode/static/geonode/css/base.css

@@ -7900,29 +7900,4 @@ form-inline {
 #missing-values {
   color: #bd362f;
   font-style: italic;
-}g-values {
-  color: #bd362f;
-  font-style: italic;
-}g-values {
-  color: #bd362f;
-  font-style: italic;
-}g-values {
-  color: #bd362f;
-  font-style: italic;
-}g-values {
-  color: #bd362f;
-  font-style: italic;
-}g-values {
-  color: #bd362f;
-  font-style: italic;
-}g-values {
-  color: #bd362f;
-  font-style: italic;
-}g-values {
-  color: #bd362f;
-  font-style: italic;
-}c;
-}g-values {
-  color: #bd362f;
-  font-style: italic;
 }

geonode/tests/suite/runner.py

@@ -31,6 +31,26 @@
 null_file = open('/dev/null', 'w')
 
 
+class GeoNodeBaseSuiteDiscoverRunner(DiscoverRunner):
+
+    def __init__(self, pattern=None, top_level=None, verbosity=1,
+                 interactive=True, failfast=True, keepdb=False,
+                 reverse=False, debug_mode=False, debug_sql=False, parallel=0,
+                 tags=None, exclude_tags=None, **kwargs):
+        self.pattern = pattern
+        self.top_level = top_level
+        self.verbosity = verbosity
+        self.interactive = interactive
+        self.failfast = failfast
+        self.keepdb = keepdb
+        self.reverse = reverse
+        self.debug_mode = debug_mode
+        self.debug_sql = debug_sql
+        self.parallel = parallel
+        self.tags = set(tags or [])
+        self.exclude_tags = set(exclude_tags or [])
+
+
 class BufferWritesDevice(object):
 
     def __init__(self):
@@ -58,10 +78,9 @@ def isatty(self):
 class ParallelTestSuiteRunner(object):
 
     def __init__(self, pattern=None, top_level=None, verbosity=1,
-                 interactive=True, failfast=False, keepdb=True,
+                 interactive=True, failfast=True, keepdb=False,
                  reverse=False, debug_mode=False, debug_sql=False, parallel=0,
                  tags=None, exclude_tags=None, **kwargs):
-
         self.pattern = pattern
         self.top_level = top_level
         self.verbosity = verbosity
@@ -326,10 +345,9 @@ class DjangoParallelTestSuiteRunner(ParallelTestSuiteRunner,
                                     DiscoverRunner):
 
     def __init__(self, pattern=None, top_level=None, verbosity=1,
-                 interactive=True, failfast=False, keepdb=True,
+                 interactive=True, failfast=True, keepdb=False,
                  reverse=False, debug_mode=False, debug_sql=False, parallel=0,
                  tags=None, exclude_tags=None, **kwargs):
-
         self.pattern = pattern
         self.top_level = top_level
         self.verbosity = verbosity
@@ -342,8 +360,6 @@ def __init__(self, pattern=None, top_level=None, verbosity=1,
         self.parallel = parallel
         self.tags = set(tags or [])
         self.exclude_tags = set(exclude_tags or [])
-        super(DjangoParallelTestSuiteRunner, self).__init__(verbosity, interactive,
-                                                            failfast, **kwargs)
         self._keyboard_interrupt_intercepted = False
         self._worker_max = kwargs.get('worker_max', WORKER_MAX)
         self._worker_count = kwargs.get('worker_count', WORKER_COUNT)

geonode/utils.py

@@ -1098,7 +1098,10 @@ def designals():
 
     for signalname in signalnames:
         if signalname in signals_store:
-            signaltype = getattr(models.signals, signalname)
+            try:
+                signaltype = getattr(models.signals, signalname)
+            except:
+                continue
             logger.debug("RETRIEVE: %s: %d" %
                          (signalname, len(signaltype.receivers)))
             signals_store[signalname] = []

geonode/views.py

@@ -88,7 +88,8 @@ def ajax_lookup(request):
     keyword = request.POST['query']
     users = get_user_model().objects.filter(Q(username__icontains=keyword)).exclude(Q(username='AnonymousUser') |
                                                                                     Q(is_active=False))
-    groups = GroupProfile.objects.filter(Q(title__icontains=keyword))
+    groups = GroupProfile.objects.filter(Q(title__icontains=keyword) |
+                                         Q(slug__icontains=keyword))
     json_dict = {
         'users': [({'username': u.username}) for u in users],
         'count': users.count(),