Skip to content

make sure locale fallback for get_entries gets assigned to the correct variable #7482

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
danielfmiranda merged 3 commits into from
Sep 24, 2021
Merged

make sure locale fallback for get_entries gets assigned to the correct variable #7482

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1aa2b60
make sure locale fallback for get_entries gets assigned to the correc…
Pomax Sep 24, 2021
b4a7cb5
Update network-api/networkapi/wagtailpages/pagemodels/index.py
Pomax Sep 24, 2021
3b9be8d
Merge branch 'main' into fix-load-more-button
danielfmiranda Sep 24, 2021
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
7 changes: 6 additions & 1 deletion network-api/networkapi/wagtailpages/pagemodels/index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,14 @@ def get_entries(self, context=dict()):
"""
DEFAULT_LANGUAGE_CODE = settings.LANGUAGE_CODE
DEFAULT_LOCALE = Locale.objects.get(language_code=DEFAULT_LANGUAGE_CODE)
locale = get_locale_from_request(context.get('request', DEFAULT_LOCALE))

if 'request' in context:
locale = get_locale_from_request(context.get('request'))
Comment thread
Pomax marked this conversation as resolved.
Outdated
else:
locale = DEFAULT_LOCALE

entries = self.get_all_entries(locale)

if hasattr(self, 'filtered'):
entries = self.filter_entries(entries, context)

Expand Down