better data catalog support and theme context for v3.0.2

Author: rhodges

layers/models.py

@@ -747,7 +747,20 @@ def catalog_html(self):
                 "data_catalog/includes/cacheless_layer_info.html",
                 {
                     'layer': self,
-                    # 'sub_layers': self.sublayers.exclude(layer_type="placeholder")
+                    'theme': None,
+                }
+            )
+        except Exception as e:
+            print(e)
+
+    def get_catalog_html(self, theme=None):
+        from django.template.loader import render_to_string
+        try:
+            return render_to_string(
+                "data_catalog/includes/cacheless_layer_info.html",
+                {
+                    'layer': self,
+                    'theme': theme,
                 }
             )
         except Exception as e:

layers/urls.py

@@ -15,6 +15,7 @@
     re_path(r'^get_theme_details/(?P<themeID>\d+)/?$', views.get_theme_details),
     re_path(r'^get_layer_details/(?P<layerID>\d+)/?$', views.get_layer_details),
     re_path(r'^wms_capabilities', views.wms_request_capabilities),
+    re_path(r'^get_layer_catalog_content/(?P<objectType>\w+)/(?P<objectID>\d+)/(?P<themeID>\d+)/?$', views.get_layer_catalog_content),
     path('get_layer_catalog_content/<objectType>/<int:objectID>/', views.get_layer_catalog_content),
     re_path(r'^get_catalog_records/', views.get_catalog_records),
     re_path(r'^migration/layer_status/', views.layer_status),

layers/views.py

@@ -506,9 +506,12 @@ def wms_request_capabilities(request):
 
     return JsonResponse(result)
 
-def get_layer_catalog_content(request, objectType, objectID):
+def get_layer_catalog_content(request, objectType, objectID, themeID=None):
     if objectType == 'layer':
         layer = Layer.all_objects.get(pk=objectID)
+        if not themeID is None:
+            theme = Theme.all_objects.get(pk=themeID)
+            return JsonResponse({'html': layer.get_catalog_html(theme=theme)})
         return JsonResponse({'html': layer.catalog_html})
     elif objectType == 'theme':
         theme = Theme.all_objects.get(pk=objectID)