8000 fix: Show pages titles using fallback languages in pagetree by fsbraun · Pull Request #7955 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

fix: Show pages titles using fallback languages in pagetree #7955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 17, 2024
Merged

fix: Show pages titles using fallback languages in pagetree #7955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e23cdcf
Fix: Show fallback language titles in pagetree
fsbraun Jul 11, 2024
22683e9
Merge branch 'develop-4' into fix/page-tree
fsbraun Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cms/admin/pageadmin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1144,7 +1144,7 @@ def changelist_view(self, request, extra_context=None):
Prefetch(
'pagecontent_set',
to_attr='filtered_translations',
queryset=self.get_queryset(request),
queryset=page_contents,
),
)

Expand Down Expand Up @@ -1381,7 +1381,7 @@ def get_tree(self, request):
Prefetch(
'pagecontent_set',
to_attr='filtered_translations',
queryset=self.get_queryset(request),
queryset=PageContent.admin_manager.get_queryset(),
),
)
rows = self.get_tree_rows(
Expand Down
2 changes: 1 addition & 1 deletion cms/templates/admin/cms/page/tree/menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@
{% block extra_cols %}{% endblock %}
>

{% language LANGUAGE_CODE %}
{% language preview_language %}
{% get_page_display_name page %}
{% endlanguage %}

Expand Down
26 changes: 15 additions & 11 deletions cms/templatetags/cms_admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,28 +99,32 @@ def get_page_display_name(cms_page):
if not cms_page.page_content_cache:
cms_page.set_translations_cache()

fallback_found = False
if not cms_page.page_content_cache.get(language):
fallback_found = True
fallback_langs = i18n.get_fallback_languages(language)
found = False
for lang in fallback_langs:
if cms_page.page_content_cache.get(lang):
found = True
language = lang
if not found:
break
else:
language = None
for lang, item in cms_page.page_content_cache.items():
if not isinstance(item, EmptyPageContent):
language = lang
if not language:
return _("Empty")
break
else:
return _("Empty")
page_content = cms_page.page_content_cache[language]
if page_content.title:
return page_content.title
if page_content.page_title:
return page_content.page_title
if page_content.menu_title:
return page_content.menu_title
return cms_page.get_slug(language)
title = page_content.title
elif page_content.page_title:
title = page_content.page_title
elif page_content.menu_title:
title = page_content.menu_title
else:
title = cms_page.get_slug(language)
return mark_safe(f"<em>{title} ({language})</em>") if fallback_found else title


class TreePublishRow(Tag):
Expand Down
14 changes: 7 additions & 7 deletions cms/tests/test_templatetags.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,16 @@ def test_get_admin_tree_title(self):
with self.settings(CMS_LANGUAGES=languages):
with force_language('fr'):
page.page_content_cache = {'en': PageContent(page_title="test2", title="test2")}
self.assertEqual('test2', force_str(get_page_display_name(page)))
self.assertEqual('<em>test2 (en)</em>', force_str(get_page_display_name(page)))
page.page_content_cache = {'en': PageContent(page_title="test2")}
self.assertEqual('test2', force_str(get_page_display_name(page)))
page.page_content_cache = {'en': PageContent(menu_title="test2")}
self.assertEqual('test2', force_str(get_page_display_name(page)))
self.assertEqual('<em>test2 (en)</em>', force_str(get_page_display_name(page)))
page.page_content_cache = {'en': PageContent(menu_title="menu test2")}
self.assertEqual('<em>menu test2 (en)</em>', force_str(get_page_display_name(page)))
page.page_content_cache = {'en': PageContent()}
page.urls_cache = {'en': PageUrl(slug='test2')}
self.assertEqual('test2', force_str(get_page_display_name(page)))
page.urls_cache = {'en': PageUrl(slug='slug-test2')}
self.assertEqual('<em>slug-test2 (en)</em>', force_str(get_page_display_name(page)))
page.page_content_cache = {'en': PageContent(), 'fr': EmptyPageContent('fr')}
self.assertEqual('test2', force_str(get_page_display_name(page)))
self.assertEqual('<em>slug-test2 (en)</em>', force_str(get_page_display_name(page)))

def test_get_site_id_from_nothing(self):
with self.settings(SITE_ID=10):
Expand Down
Loading
0