[Fixes #8712] Improve/fix GEONODE_APPS_ENABLE handling (#8730)

* [Fixes #8712] Improve/fix GEONODE_APPS_ENABLE handling

* [Fixes #8712] Exclusion of geoapp from geonode urls if GEONODE_APPS_ENABLE is false

(cherry picked from commit a3b682d)

# Conflicts:
#	geonode/api/resourcebase_api.py

geonode/api/resourcebase_api.py

@@ -51,7 +51,7 @@
 from geonode.base.models import HierarchicalKeyword
 from geonode.base.bbox_utils import filter_bbox
 from geonode.groups.models import GroupProfile
-from geonode.utils import check_ogc_backend, get_subclasses_by_model
+from geonode.utils import check_ogc_backend, get_geoapps_models, get_subclasses_by_model
 from geonode.security.utils import get_visible_resources
 from .authentication import OAuthAuthentication
 from .authorization import GeoNodeAuthorization, GeonodeApiKeyAuthentication
@@ -237,6 +237,9 @@ def apply_filters(self, request, applicable_filters):
         if keywords:
             filtered = self.filter_h_keywords(filtered, keywords)
 
+        if not settings.GEONODE_APPS_ENABLE:
+            geoapps_model = get_geoapps_models()
+            filtered = filtered.exclude(resource_type__in=[list(x.models.items())[0][0] for x in geoapps_model])
         # return filtered
         return get_visible_resources(
             filtered,

geonode/base/templatetags/base_tags.py

@@ -296,21 +296,22 @@ def facets(context):
 
             facets['layer'] = facets['raster'] + facets['vector'] + facets['remote'] + facets['wms']
 
-        facet_geoapp = _facets_geoapps(
-            request,
-            title_filter,
-            abstract_filter,
-            purpose_filter,
-            category_filter,
-            regions_filter,
-            owner_filter,
-            date_gte_filter,
-            date_lte_filter,
-            date_range_filter,
-            extent_filter,
-            keywords_filter,
-            authorized
-        )
+        if settings.GEONODE_APPS_ENABLE:
+            facet_geoapp = _facets_geoapps(
+                request,
+                title_filter,
+                abstract_filter,
+                purpose_filter,
+                category_filter,
+                regions_filter,
+                owner_filter,
+                date_gte_filter,
+                date_lte_filter,
+                date_range_filter,
+                extent_filter,
+                keywords_filter,
+                authorized
+            )
 
         facets = {
             **facets,

geonode/geoapps/models.py

@@ -18,6 +18,7 @@
 #
 #########################################################################
 import logging
+from django.conf import settings
 
 from django.db import models
 from django.urls import reverse
@@ -125,7 +126,10 @@ def keywords_list(self):
             return []
 
     def get_absolute_url(self):
-        return reverse('geoapp_detail', None, [str(self.id)])
+        geoapp_view = (
+            reverse("geoapp_detail", None, [str(self.id)]) if settings.GEONODE_APPS_ENABLE else reverse("home")
+        )
+        return geoapp_view
 
     @property
     def embed_url(self):

geonode/geoapps/urls.py

@@ -30,6 +30,7 @@
 
 apps_list = register_url_event()(TemplateView.as_view(template_name='apps/app_list.html'))
 
+
 urlpatterns = [
     # 'geonode.geoapps.views',
     url(r'^$',

geonode/urls.py

@@ -107,9 +107,6 @@
     # Documents views
     url(r'^documents/', include('geonode.documents.urls')),
 
-    # Apps views
-    url(r'^apps/', include('geonode.geoapps.urls')),
-
     # Catalogue views
     url(r'^catalogue/', include('geonode.catalogue.urls')),
 
@@ -183,6 +180,9 @@
     url(r'^tinymce/', include('tinymce.urls')),
 ]
 
+if settings.GEONODE_APPS_ENABLE:
+    urlpatterns += [url(r'^apps/', include('geonode.geoapps.urls'))]
+
 urlpatterns += i18n_patterns(
     url(r'^grappelli/', include('grappelli.urls')),
     url(r'^admin/', admin.site.urls, name="admin"),

geonode/utils.py

@@ -2147,6 +2147,8 @@ def verify_image(stream):
 
 
 def get_subclasses_by_model(model: str):
+    if not settings.GEONODE_APPS_ENABLE:
+        return []
     from django.apps import apps
     _app_subclasses = []
     for _model in apps.get_models():