Fixed n+1 select problem (#113)

* Reduce queries
nephila · Dec 22, 2019 · 050bf2c · 050bf2c
1 parent 87ed135
commit 050bf2c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -8,6 +8,7 @@ History
 ===================
 
 * Move from djangocms-helper to django-app-helper
+* Improve toolbar performance
 
 0.9.0 (2019-08-22)
 ==================

diff --git a/djangocms_page_meta/cms_toolbars.py b/djangocms_page_meta/cms_toolbars.py
@@ -91,20 +91,20 @@ def populate(self):
                 site_id = self.page.node.site_id
             except AttributeError:  # CMS_3_4
                 site_id = self.page.site_id
-            for title in self.page.title_set.filter(
+            titles = self.page.title_set.filter(
                 language__in=get_language_list(site_id)
-            ):
-                try:
-                    title_extension = TitleMeta.objects.get(
-                        extended_object_id=title.pk
-                    )
-                except TitleMeta.DoesNotExist:
-                    title_extension = None
+            )
+
+            title_extensions = {t.extended_object_id: t for t in TitleMeta.objects.filter(
+                extended_object_id__in=[title.id for title in titles]
+            )}
+
+            for title in titles:
                 try:
-                    if title_extension:
+                    if title.pk in title_extensions:
                         url = reverse(
                             'admin:djangocms_page_meta_titlemeta_change',
-                            args=(title_extension.pk,)
+                            args=(title_extensions[title.pk].pk,)
                         )
                     else:
                         url = '%s?extended_object=%s' % (