8000 chore: Merging back 5.0.0a1 build by fsbraun · Pull Request #8169 · django-cms/django-cms · GitHub
[go: up one dir, main page]

Skip to content

chore: Merging back 5.0.0a1 build #8169

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.

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 14 commits into from
Mar 3, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Small docs update
  • Loading branch information
fsbraun committed Mar 2, 2025
commit d82a92823bb0560623678a9a0031b0331c9f5a9c
4 changes: 2 additions & 2 deletions cms/toolbar/items.py
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ def __repr__(self):
class ModalItem(FrameItem):
"""
Sends a GET request; loads response in a modal window. Use an
:class:`~ToolbarAPIMixin.add_modal_item` method to create a ``ModalItem`` instance. Can be
:class:`~cms.toolbar.items.ToolbarAPIMixin.add_modal_item` method to create a ``ModalItem`` instance. Can be
added to :class:`~cms.toolbar.toolbar.CMSToolbar`, :class:`~cms.toolbar.items.Menu`,
:class:`~cms.toolbar.items.SubMenu`.
"""
Expand All @@ -429,7 +429,7 @@ def __repr__(self):

class AjaxItem(BaseItem):
"""
Sends a POST request. Use an :class:`~ToolbarAPIMixin.add_ajax_item` method to create a
Sends a POST request. Use an :class:`~cms.toolbar.items.ToolbarAPIMixin.add_ajax_item` method to create a
``AjaxItem`` instance. Can be added to :class:`~cms.toolbar.toolbar.CMSToolbar`,
:class:`~cms.toolbar.items.Menu`, :class:`~cms.toolbar.items.SubMenu`.

Expand Down
2 changes: 1 addition & 1 deletion cms/toolbar/toolbar.py
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ def render_with_structure(self, context, nodelist):
return f'{toolbar}\n{rendered_contents}'


# Add toolbar mixins from extensions to toolbar
#: :class:`CMSToolbarBase` including toolbar mixins from extensions to toolbar
CMSToolbar = type("CMSToolbar", tuple(cms_toolbar_extensions + [CMSToolbarBase]), dict())


Expand Down
1 change: 1 addition & 0 deletions docs/explanation/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ with explaining *how to do things* than with helping you understand *how it work
multiple_languages
i18n
permissions
searchdocs
touch
colorscheme
menu_system
Expand Down
4 changes: 2 additions & 2 deletions docs/requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ sphinx-autobuild
datetime
coverage
django~=4.2
git+https://github.com/django-cms/django-cms@release/4.1.x
-e ..
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is something left from local development? Looks like it is failing the CI.

codespell
pip-tools
docstrfmt
git+https://github.com/django-cms/djangocms-ecosystem
git+https://github.com/django-cms/djangocms-ecosystem # important to install directly from github
4 changes: 2 additions & 2 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#
--extra-index-url https://www.piwheels.org/simple

-e ..
# via -r requirements.in
alabaster==1.0.0
# via sphinx
anyio==4.6.0
Expand Down Expand Up @@ -53,8 +55,6 @@ django-classy-tags==4.1.0
# via
# django-cms
# django-sekizai
django-cms @ git+https://github.com/django-cms/django-cms@release/4.1.x
# via -r requirements.in
django-formtools==2.5.1
# via django-cms
django-sekizai==4.1.0
Expand Down
2 changes: 1 addition & 1 deletion docs/upgrade/3.0.6.rst
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ filters in ``PageUserAdmin`` as in the custom user model admin.

A new method on plugins, that returns the template during the render phase,
allowing you to change the template based on any plugin attribute or context
status. See :doc:`/how_to/custom_plugins` for more.
status. See :doc:`/how_to/09-custom_plugins` for more.

Simplified toolbar API for page extensions
==========================================
Expand Down
2 changes: 1 addition & 1 deletion docs/upgrade/3.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ New Toolbar

The toolbar's code has been simplified and its appearance refreshed. The
toolbar is now a more consistent management tool for adding and changing
objects. See :doc:`/how_to/toolbar`.
objects. See :doc:`/how_to/13-toolbar`.

.. warning:: Upgrading from previous versions

Expand Down
6 changes: 3 additions & 3 deletions docs/upgrade/3.1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Other than this, end users should not notice any changes.
Action required
---------------

Run :ref:`manage.py cms fix-mptt <fix-mptt>` before you upgrade.
Run ``manage.py cms fix-mptt`` before you upgrade.

Developers who use django CMS will need to run the schema and data migrations that are part of this
release. Developers of third-party applications that relied on the Django MPTT that shipped with
Expand Down Expand Up @@ -198,7 +198,7 @@ Check the readme file of each plugin when upgrading to know the actions required
Structure mode permission
=========================

A new :doc:`Can use Structure mode* permission </topics/permissions>` has been added.
A new :doc:`Can use Structure mode* permission </explanation/permissions>` has been added.

Without this permission, a non-superuser will no longer have access to structure mode. This makes
possible a more strict workflow, in which certain users are able to edit content but not structure.
Expand Down Expand Up @@ -236,7 +236,7 @@ including the use of "clipboard-like" items.
Per-namespace apphook configuration
===================================

django CMS provides a new API to define namespaced :doc:`Apphook </how_to/apphooks>` configurations.
django CMS provides a new API to define namespaced :doc:`Apphook </how_to/11-apphooks>` configurations.

`Aldryn Apphooks Config <https://github.com/aldryn/aldryn-apphooks-config>`_ has
been created and released as a standard implementation to take advantage
Expand Down
Loading
0