8000 fix: django 5's choice widget is not lazy by fsbraun · Pull Request #7707 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

fix: django 5's choice widget is not lazy #7707

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 12 commits into from
Nov 30, 2023
Merged

fix: django 5's choice widget is not lazy #7707

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ded6931
Support for Django 5.0
fsbraun Sep 19, 2023
a5188f4
Fix: test.yml and django Promise handling
fsbraun Sep 19, 2023
3c62c13
Shorten github action names
fsbraun Sep 19, 2023
b52eedd
Update test.yml
fsbraun Sep 19, 2023
cea7c43
Update _cms.scss
fsbraun Sep 19, 2023
ecc6fac
Update setup.py
fsbraun Sep 20, 2023
12ee930
Fix: Django 5 choice widget is not lazy either
fsbraun Nov 29, 2023
0f7c052
Merge branch 'develop-4' into feat/django-5-support
fsbraun Nov 29, 2023
2efb900
Add test
fsbraun Nov 29, 2023
7bed553
Fix: Swapped underscore
fsbraun Nov 29, 2023
7fe90ea
Deprecate SuperLazyIterator and LazyChoiceField
fsbraun Nov 29, 2023
7c6199e
Merge branch 'develop-4' into feat/django-5-support
fsbraun Nov 29, 2023
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
Prev Previous commit
Next Next commit
Fix: Swapped underscore
  • Loading branch information
@fsbraun
fsbraun committed Nov 29, 2023
commit 7bed55315ea1622063a91d112663134d05eeb173
4 changes: 2 additions & 2 deletions cms/forms/fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ def choices(self, value):
# we overwrite this function so no list(value) or normalize_choices(value) is called
# also, do not call the widget's setter as of Django 5
if DJANGO_4_2:
self._choices = self.widget._choices = value
else:
self._choices = self.widget.choices = value
else:
self._choices = self.widget._choices = value


class PageSelectFormField(forms.MultiValueField):
Expand Down
6 changes: 2 additions & 4 deletions cms/tests/test_forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,10 +254,8 @@ def get_choices():
choices_called = True
return ("", "-----"),

LazyChoiceField(
choices=get_choices
)
self.assertFalse(choices_called)
LazyChoiceField(choices=SuperLazyIterator(get_choices))
self.assertFalse(choices_called, "Lazy choice function called")


class PermissionFormTestCase(CMSTestCase):
Expand Down
0