8000 chore: Prepare new dev branch (#8223) · django-cms/django-cms@e15e017 · GitHub
[go: up one dir, main page]
Skip to content

Commit e15e017

Browse files
fsbraunGithub Release Action
fsbraun
and
Github Release Action
authored
chore: Prepare new dev branch (#8223)
* [5.1.0dev1 release process] Bumped version to 5.1.0dev1 * [5.1.0dev1 release process] compilemessages * [5.1.0dev1 release process] compiling new static files * [5.1.0dev1 release process] updating latest docs * Prepare new main branch * Fix typos * fix: No changes to changelog * fix: Remove unnecessary change to migration * Remove circular import * Fix import order * Re-introduce dummy `PlaceholderField` for legacy migrations * fix: Do not assume page url cache to be filled * fix: Structure board update sometimes failed to add all interactive elements (#8227) * fix: Scan plugin data after structure mode Xhr load * Fix test * fix js linting issues * fix: Update assets * fix: Empty plugin selectors in all but first placeholder * fix: Add slotname argument to dummy `PlaceholderField` * fix: Adjust checks for `GrouperAdmin` to allow for `prepopulated_fields` (#8232) * fix: Adjust checks for GrouperAdmin to allow for `prepopulated_fields` * Update cms/tests/test_grouper_admin.py --------- Co-authored-by: Github Release Action <info@django-cms.org>
1 parent de313e7 commit e15e017

File tree

71 files changed

+437
-1176
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+437
-1176
lines changed

‎cms/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '5.0.0'
1+
__version__ = '5.1.0dev1'

‎cms/admin/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import cms.admin.permissionadmin # noqa: F401
33
import cms.admin.placeholderadmin # noqa: F401
44
import cms.admin.settingsadmin # noqa: F401
5-
import cms.admin.static_placeholder # noqa: F401
65
import cms.admin.useradmin # noqa: F401
76

87
# Piggyback off admin.autodiscover() to discover cms plugins

‎cms/admin/forms.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
from cms.plugin_pool import plugin_pool
4848
from cms.signals.apphook import set_restart_trigger
4949
from cms.utils.compat.forms import UserChangeForm
50-
from cms.utils.compat.warnings import RemovedInDjangoCMS51Warning
5150
from cms.utils.conf import get_cms_setting
5251
from cms.utils.i18n import get_language_list, get_site_language_from_request
5352
from cms.utils.page import get_clean_username
@@ -917,14 +916,6 @@ def get_root_pages(self):
917916
pages = Page.get_root_nodes()
918917
return pages.exclude(is_page_type=not self.page.is_page_type)
919918

920-
def get_root_nodes(self):
921-
warnings.warn(
922-
"Method `get_root_nodes()` is deprecated. Instead use method `get_root_pages`.",
923-
RemovedInDjangoCMS51Warning,
924-
stacklevel=2,
925-
)
926-
return self.get_root_pages()
927-
928919
def get_tree_options(self):
929920
position = self.cleaned_data["position"]
930921
if target_page := self.cleaned_data.get("target"):

‎cms/admin/placeholderadmin.py

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
from cms.signals import post_placeholder_operation, pre_placeholder_operation
3939
from cms.toolbar.utils import create_child_plugin_references, get_plugin_content, get_plugin_tree
4040
from cms.utils import get_current_site
41-
from cms.utils.compat.warnings import RemovedInDjangoCMS51Warning
4241
from cms.utils.conf import get_cms_setting
4342
from cms.utils.i18n import get_language_code, get_language_list
4443
from cms.utils.plugins import (
@@ -187,30 +186,6 @@ def _get_object_for_single_field(self, object_id: int, language: str) -> models.
187186
return manager.get(pk=object_id)
188187

189188

190-
class PlaceholderAdminMixinBase(forms.MediaDefiningClass):
191-
def __new__(cls, name, bases, attrs):
192-
super_new = super().__new__
193-
parents = [b for b in bases if isinstance(b, PlaceholderAdminMixinBase)]
194-
195-
if not parents:
196-
return super_new(cls, name, bases, attrs)
197-
warnings.warn(
198-
"PlaceholderAdminMixin is no longer needed and thus will be removed in django CMS 5.0",
199-
RemovedInDjangoCMS51Warning,
200-
stacklevel=2,
201-
)
202-
return super_new(cls, name, bases, attrs)
203-
204-
205-
class PlaceholderAdminMixin(metaclass=PlaceholderAdminMixinBase):
206-
"""
207-
.. warning::
208-
209-
PlaceholderAdminMixin is deprecated. It is no longer needed and thus will be removed
210-
"""
211-
pass
212-
213-
214189
@admin.register(Placeholder)
215190
class PlaceholderAdmin(BaseEditableAdminMixin, admin.ModelAdmin):
216191
"""Placeholder admin manages placeholders and their plugins, as well as the preview, edit, and

‎cms/admin/static_placeholder.py

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0