8000 fix: added redirect message when in editing a redirect toolbar object by theShinigami · Pull Request #8056 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

fix: added redirect message when in editing a redirect toolbar object #8056

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 4 commits into from
Nov 3, 2024
Merged

fix: added redirect message when in editing a redirect toolbar object #8056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
565d4cc
fix: add redirect notification page when in edit mode
theShinigami Nov 1, 2024
d77201e
refactor(details): remove setting of redirect_url
theShinigami Nov 2, 2024
5216c17
test: add test to verify message display when redirect is set
theShinigami Nov 2, 2024
553f7a4
refactor: remove unused variable from details view
theShinigami Nov 2, 2024
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
22 changes: 22 additions & 0 deletions cms/tests/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,28 @@ def test_apphook_not_hooked(self):
self.assertEqual(response.status_code, 200)
self.apphook_clear()

def test_redirect_preview_in_edit_mode(self):

user = self.get_superuser()
page = create_page("page", "nav_playground.html", "fr")
page_content = create_page_content("en", "home", page, redirect="https://example.com")

page.set_as_homepage()

with self.login_user_context(user), force_language('fr'):
edit_url = get_object_edit_url(page_content, language='fr')
response = self.client.get(edit_url, follow=True)

expected = f"""
<div class="cms-screenblock">
<div class="cms-screenblock-inner">
<h1>This page has no preview!</h1>
<p>It is being redirected to: <a href="{page_content.redirect}">{page_content.redirect}</a></p>
</div>
</div>
"""
self.assertContains(response, expected, count=1, html=True)

def test_external_redirect(self):
# test external redirect
redirect_one = 'https://www.django-cms.org/'
Expand Down
10 changes: 6 additions & 4 deletions cms/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ def details(request, slug):
# Get a Page model object from the request
site = get_current_site()
page = get_page_from_request(request, use_path=slug)
toolbar = get_toolbar_from_request(request)

if not page and not slug and not Page.objects.on_site(site).exists():
# render the welcome page if the requested path is root "/"
Expand Down Expand Up @@ -190,9 +189,7 @@ def details(request, slug):
redirect_url = _clean_redirect_url(redirect_url, request_language)

if redirect_url:
if request.user.is_staff and toolbar.edit_mode_active:
toolbar.redirect_url = redirect_url
elif redirect_url not in own_urls:
if redirect_url not in own_urls:
if get_cms_setting('REDIRECT_PRESERVE_QUERY_PARAMS'):
query_string = request.META.get('QUERY_STRING')
if query_string:
Expand Down Expand Up @@ -326,6 +323,11 @@ def render_object_endpoint(request, content_type_id, object_id, require_editable
toolbar = get_toolbar_from_request(request)
toolbar.set_object(content_type_obj)

if request.user.is_staff and toolbar.edit_mode_active:
redirect = getattr(content_type_obj, "redirect", None)
if isinstance(redirect, str):
toolbar.redirect_url = redirect

if require_editable and not toolbar.object_is_editable():
# If not editable, switch from edit to preview endpoint
return HttpResponseRedirect(get_object_preview_url(content_type_obj))
Expand Down
Loading
0