Prefetch latest_translation__approved_user (mozilla#3106)

mathjazz · Feb 21, 2024 · 4cf62b9 · 4cf62b9
1 parent 0afb7d7
commit 4cf62b9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/pontoon/administration/views.py b/pontoon/administration/views.py
@@ -45,7 +45,9 @@ def admin(request):
 
     projects = (
         Project.objects.all()
-        .prefetch_related("latest_translation__user")
+        .prefetch_related(
+            "latest_translation__user", "latest_translation__approved_user"
+        )
         .order_by("name")
     )
 

diff --git a/pontoon/base/models.py b/pontoon/base/models.py
@@ -683,7 +683,7 @@ def prefetch_project_locale(self, project):
                 "project_locale",
                 queryset=(
                     ProjectLocale.objects.filter(project=project).prefetch_related(
-                        "latest_translation__user"
+                        "latest_translation__user", "latest_translation__approved_user"
                     )
                 ),
                 to_attr="fetched_project_locale",
@@ -1210,7 +1210,7 @@ def prefetch_project_locale(self, locale):
                 "project_locale",
                 queryset=(
                     ProjectLocale.objects.filter(locale=locale).prefetch_related(
-                        "latest_translation__user"
+                        "latest_translation__user", "latest_translation__approved_user"
                     )
                 ),
                 to_attr="fetched_project_locale",

diff --git a/pontoon/projects/views.py b/pontoon/projects/views.py
@@ -27,7 +27,9 @@ def projects(request):
     projects = (
         Project.objects.visible()
         .visible_for(request.user)
-        .prefetch_related("latest_translation__user")
+        .prefetch_related(
+            "latest_translation__user", "latest_translation__approved_user"
+        )
         .order_by("name")
     )
 

diff --git a/pontoon/teams/views.py b/pontoon/teams/views.py
@@ -31,7 +31,9 @@
 
 def teams(request):
     """List all active localization teams."""
-    locales = Locale.objects.available().prefetch_related("latest_translation__user")
+    locales = Locale.objects.available().prefetch_related(
+        "latest_translation__user", "latest_translation__approved_user"
+    )
 
     form = LocaleRequestForm()