Merge branch 'develop' – OpsLearning get_queryset for the Admin page

Author: szabozoltan69

notifications/templates/design/main_newop3.html

@@ -1,5 +1,6 @@
 <!-- Main -->
 {% load humanize %}
+{% load custom_tags %}
 
 {% if records|length %}
   {% for op in records %}

per/admin.py

@@ -198,6 +198,23 @@ class OpsLearningAdmin(GotoNextModelAdmin):
     actions = ["export_selected_records"]
     _original_is_validated = False
 
+    def get_queryset(self, request):
+        return (
+            super()
+            .get_queryset(request)
+            .select_related(
+                "appeal_code",
+            )
+            .prefetch_related(
+                "sector",
+                "sector_validated",
+                "organization",
+                "organization_validated",
+                "per_component",
+                "per_component_validated",
+            )
+        )
+
     def get_fields(self, request, obj=None):
         if obj and obj.is_validated:
             return (

per/drf_views.py

@@ -792,10 +792,10 @@ def get_queryset(self):
                 "appeal_code",
             ).prefetch_related(
                 "sector",
-                "organization",
-                "per_component",
                 "sector_validated",
+                "organization",
                 "organization_validated",
+                "per_component",
                 "per_component_validated",
                 "appeal_code__event__countries_for_preview",
             )
@@ -806,10 +806,10 @@ def get_queryset(self):
             )
             .prefetch_related(
                 "sector",
-                "organization",
-                "per_component",
                 "sector_validated",
+                "organization",
                 "organization_validated",
+                "per_component",
                 "per_component_validated",
                 "appeal_code__event__countries_for_preview",
             )