django-cms · fsbraun · Aug 7, 2024 · Jul 11, 2024 · Jul 12, 2024 · Jul 12, 2024
diff --git a/cms/admin/pageadmin.py b/cms/admin/pageadmin.py
@@ -847,7 +847,7 @@ def get_preserved_filters(self, request):
     def get_queryset(self, request):
         site = get_site(request)
         languages = get_language_list(site.pk)
-        queryset = super().get_queryset(request)
+        queryset = super().get_queryset(request).select_related('page')
         queryset = queryset.filter(language__in=languages, page__site=site)
         return queryset
 
@@ -1400,7 +1400,7 @@ def get_tree(self, request):
             Prefetch(
                 'pagecontent_set',
                 to_attr='filtered_translations',
-                queryset=PageContent.admin_manager.get_queryset(),
+                queryset=self.get_queryset(request),
             ),
         )
         rows = self.get_tree_rows(

diff --git a/cms/cms_menus.py b/cms/cms_menus.py
diff --git a/cms/models/pagemodel.py b/cms/models/pagemodel.py
@@ -143,12 +143,11 @@ def __str__(self):
         try:
             title = self.get_menu_title(fallback=True)
         except LanguageError:
-            try:
-                title = self.pagecontent_set(manager="admin_manager").current()[0]
-            except IndexError:
-                title = None
+            title = self.pagecontent_set(manager="admin_manager").current_content().first()
+            if title:
+                title = title.title
         if title is None:
-            title = ""
+            title = _("Empty")
         return force_str(title)
 
     def __repr__(self):
@@ -778,7 +777,7 @@ def get_path(self, language, fallback=True):
 
         if language not in self.urls_cache:
             self.urls_cache.update({
-                url.language: url for url in self.urls.filter(language__in=languages)  # TODO: overwrites multiple urls
+                url.language: url for url in self.urls.all() if url.language in languages # TODO: overwrites multiple urls
             })
 
             for _language in languages: