8000 chore: Prepare new dev branch by fsbraun · Pull Request #8223 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

chore: Prepare new dev branch #8223

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 18 commits into from
May 21, 2025
Merged

chore: Prepare new dev branch #8223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5dcfaee
[5.1.0dev1 release process] Bumped version to 5.1.0dev1
May 12, 2025
0e66eb1
[5.1.0dev1 release process] compilemessages
May 12, 2025
f62dc80
[5.1.0dev1 release process] compiling new static files
May 12, 2025
2e61493
[5.1.0dev1 release process] updating latest docs
May 12, 2025
e73c887
Prepare new main branch
fsbraun May 12, 2025
752eee1
Fix typos
fsbraun May 12, 2025
0df9391
fix: No changes to changelog
fsbraun May 12, 2025
4bc36a1
fix: Remove unnecessary change to migration
fsbraun May 12, 2025
339e8c2
Remove circular import
fsbraun May 12, 2025
d31bcd2
Fix import order
fsbraun May 13, 2025
29860d1
Re-introduce dummy `PlaceholderField` for legacy migrations
fsbraun May 13, 2025
d1e5a3a
fix: Do not assume page url cache to be filled
fsbraun May 13, 2025
06e531a
fix: Structure board update sometimes failed to add all interactive e…
fsbraun May 14, 2025
4e764b9
fix: Update assets
fsbraun May 14, 2025
73feff6
fix: Empty plugin selectors in all but first placeholder
fsbraun May 14, 2025
3e6b6b8
fix: Add slotname argument to dummy `PlaceholderField`
fsbraun May 15, 2025
fa00b43
Merge branch 'main' into release/build
fsbraun May 15, 2025
a6bdc74
fix: Adjust checks for `GrouperAdmin` to allow for `prepopulated_fiel…
fsbraun May 17, 2025
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
2 changes: 1 addition & 1 deletion cms/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '5.0.0'
__version__ = '5.1.0dev1'
1 change: 0 additions & 1 deletion cms/admin/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import cms.admin.permissionadmin # noqa: F401
import cms.admin.placeholderadmin # noqa: F401
import cms.admin.settingsadmin # noqa: F401
import cms.admin.static_placeholder # noqa: F401
import cms.admin.useradmin # noqa: F401

# Piggyback off admin.autodiscover() to discover cms plugins
Expand Down
9 changes: 0 additions & 9 deletions cms/admin/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
from cms.plugin_pool import plugin_pool
from cms.signals.apphook import set_restart_trigger
from cms.utils.compat.forms import UserChangeForm
from cms.utils.compat.warnings import RemovedInDjangoCMS51Warning
from cms.utils.conf import get_cms_setting
from cms.utils.i18n import get_language_list, get_site_language_from_request
from cms.utils.page import get_clean_username
Expand Down Expand Up @@ -917,14 +916,6 @@ def get_root_pages(self):
pages = Page.get_root_nodes()
return pages.exclude(is_page_type=not self.page.is_page_type)

def get_root_nodes(self):
warnings.warn(
"Method `get_root_nodes()` is deprecated. Instead use method `get_root_pages`.",
RemovedInDjangoCMS51Warning,
stacklevel=2,
)
return self.get_root_pages()

def get_tree_options(self):
position = self.cleaned_data["position"]
if target_page := self.cleaned_data.get("target"):
Expand Down
25 changes: 0 additions & 25 deletions cms/admin/placeholderadmin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
from cms.signals import post_placeholder_operation, pre_placeholder_operation
from cms.toolbar.utils import create_child_plugin_references, get_plugin_content, get_plugin_tree
from cms.utils import get_current_site
from cms.utils.compat.warnings import RemovedInDjangoCMS51Warning
from cms.utils.conf import get_cms_setting
from cms.utils.i18n import get_language_code, get_language_list
from cms.utils.plugins import (
Expand Down Expand Up @@ -187,30 +186,6 @@ def _get_object_for_single_field(self, object_id: int, language: str) -> models.
return manager.get(pk=object_id)


class PlaceholderAdminMixinBase(forms.MediaDefiningClass):
def __new__(cls, name, bases, attrs):
super_new = super().__new__
parents = [b for b in bases if isinstance(b, PlaceholderAdminMixinBase)]

if not parents:
return super_new(cls, name, bases, attrs)
warnings.warn(
"PlaceholderAdminMixin is no longer needed and thus will be removed in django CMS 5.0",
RemovedInDjangoCMS51Warning,
stacklevel=2,
)
return super_new(cls, name, bases, attrs)


class PlaceholderAdminMixin(metaclass=PlaceholderAdminMixinBase):
"""
.. warning::

PlaceholderAdminMixin is deprecated. It is no longer needed and thus will be removed
"""
pass


@admin.register(Placeholder)
class PlaceholderAdmin(BaseEditableAdminMixin, admin.ModelAdmin):
"""Placeholder admin manages placeholders and their plugins, as well as the preview, edit, and
Expand Down
15 changes: 0 additions & 15 deletions cms/admin/static_placeholder.py
View file
Open in desktop

This file was deleted.

Loading
Loading
0