fix: Issue 7997 remove edit page dialog (#7999)

jrief · fsbraun · Github Release Action · web-flow · commit e8d1abf72034 · 2024-10-31T13:20:26.000+01:00
* Refactor PageAdmin.delete_view to prevent code duplication * Remove dialog Edit Page from toolbar Please see discussion at #7997 for details * fix: Enable page settings and advanced page settings in the toolbar outside edit mode (e.g. for viewing) --------- Co-authored-by: Fabian Braun <fsbraun@gmx.de> Co-authored-by: Github Release Action <info@django-cms.org>
diff --git a/cms/cms_toolbars.py b/cms/cms_toolbars.py
@@ -21,7 +21,6 @@
 from cms.toolbar_base import CMSToolbar
 from cms.toolbar_pool import toolbar_pool
 from cms.utils import get_language_from_request, page_permissions
-from cms.utils.compat import DJANGO_4_2
 from cms.utils.compat.warnings import RemovedInDjangoCMS43Warning
 from cms.utils.conf import get_cms_setting
 from cms.utils.i18n import get_language_dict, get_language_tuple
@@ -631,24 +630,16 @@ def add_page_menu(self):
             # first break
             current_page_menu.add_break(PAGE_MENU_FIRST_BREAK)
 
-            # page edit
-            with force_language(self.current_lang):
-                disabled = (
-                    edit_mode or not self.toolbar.object_is_editable()
-                )
-                page_edit_url = get_object_edit_url(self.page_content) if self.page_content else ''
-                current_page_menu.add_link_item(_('Edit this Page'), disabled=disabled, url=page_edit_url)
-
             # page settings
             page_settings_url = add_url_parameters(page_settings_url, language=self.toolbar.request_language)
-            settings_disabled = not edit_mode or not can_change
+            settings_disabled = not can_change
             current_page_menu.add_modal_item(_('Page settings'), url=page_settings_url, disabled=settings_disabled,
                                              on_close=refresh)
 
             # advanced settings
             advanced_url = add_url_parameters(advanced_url, language=self.toolbar.request_language)
             can_change_advanced = self.page.has_advanced_settings_permission(self.request.user)
-            advanced_disabled = not edit_mode or not can_change_advanced
+            advanced_disabled = not can_change_advanced
             current_page_menu.add_modal_item(_('Advanced settings'), url=advanced_url, disabled=advanced_disabled)
 
             # templates menu
