feat: Allow "View on Site" for objects not on the current site (#479)

* feat: Use `get_full_url` on versioned content if available

This allows viewing versioned content on different sites

* fix: Add a site query paramter to page admin change form

* feat: Use django-cms core's get_object_live_url if available

* fix: Linting issues

* fix: tests

---------

Co-authored-by: Fabian Braun <[email protected]>

Author: stefanw

djangocms_versioning/admin.py

@@ -47,8 +47,10 @@
     content_is_unlocked_for_user,
     create_version_lock,
     get_admin_url,
+    get_current_site,
     get_editable_url,
     get_latest_admin_viewable_content,
+    get_object_live_url,
     get_preview_url,
     proxy_model,
     remove_version_lock,
@@ -1097,9 +1099,9 @@ def publish_view(self, request, object_id):
         self.message_user(request, _("Version published"))
 
         # Redirect to published?
-        if conf.ON_PUBLISH_REDIRECT == "published":
+        if not requested_redirect and conf.ON_PUBLISH_REDIRECT == "published":
             if hasattr(version.content, "get_absolute_url"):
-                requested_redirect = requested_redirect or version.content.get_absolute_url()
+                redirect_url = get_object_live_url(version.content, site=get_current_site(request)) or redirect_url
 
         return self._internal_redirect(requested_redirect, redirect_url)
 

djangocms_versioning/cms_toolbars.py

@@ -32,7 +32,9 @@
 from djangocms_versioning.conf import ALLOW_DELETING_VERSIONS, LOCK_VERSIONS
 from djangocms_versioning.constants import DRAFT
 from djangocms_versioning.helpers import (
+    get_current_site,
     get_latest_admin_viewable_content,
+    get_object_live_url,
     version_list_url,
 )
 from djangocms_versioning.models import Version
@@ -250,7 +252,9 @@ def _add_view_published_button(self):
         if not published_version:
             return
 
-        url = published_version.get_absolute_url() if hasattr(published_version, "get_absolute_url") else None
+        url = None
+        if hasattr(published_version, "get_absolute_url"):
+            url = get_object_live_url(published_version, site=get_current_site(self.toolbar.request))
         if url and (self.toolbar.edit_mode_active or self.toolbar.preview_mode_active):
             item = ButtonList(side=self.toolbar.RIGHT)
             item.add_button(

djangocms_versioning/helpers.py

@@ -18,7 +18,7 @@
 from django.http import HttpRequest
 from django.template.loader import render_to_string
 from django.utils.encoding import force_str
-from django.utils.translation import get_language
+from django.utils.translation import get_language, override as force_language
 
 from . import versionables
 from .conf import EMAIL_NOTIFICATIONS_FAIL_SILENTLY
@@ -29,6 +29,21 @@
 except ImportError:
     emit_content_change = None
 
+try:
+    # django CMS >= 5.1
+    from cms.toolbar.utils import get_object_live_url  # noqa F401
+    from cms.utils import get_current_site  # noqa F401
+except ImportError:
+    # cms < 5.1
+    def get_object_live_url(obj, language=None, site=None) -> str:
+        with force_language(language):
+            return obj.get_absolute_url()
+
+    def get_current_site(request) -> models.Model:
+        from django.contrib.sites.models import Site
+
+        return Site.objects.get_current()
+
 
 def is_editable(content_obj: models.Model, request: HttpRequest) -> bool:
     """Check of content_obj is editable"""
@@ -72,9 +87,7 @@ def _replace_admin_for_model(modeladmin: type[admin.ModelAdmin], mixin: type, ad
     admin_site.register(modeladmin.model, new_admin_class)
 
 
-def replace_admin_for_models(
-    pairs: Iterable[tuple[type[models.Model], type]], admin_site: admin.AdminSite | None = None
-):
+def replace_admin_for_models(pairs: tuple[type[models.Model], type], admin_site: admin.AdminSite | None = None):
     """
     :param pairs: Iterable of (model class, admin mixin class) tuples
     :param admin_site: AdminSite instance

djangocms_versioning/templates/admin/djangocms_versioning/page/change_form.html

@@ -34,7 +34,7 @@
 
 
 
-<form {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="?language={{ language }}{% if request.GET.parent_page %}&amp;parent_page={{ request.GET.parent_page }}{% endif %}{# parameter `parent_node` only for django CMS 4.1 support #}{% if request.GET.parent_node %}&amp;parent_node={{ request.GET.parent_node }}{% endif %}{%if request.GET.source %}&amp;source={{ request.GET.source }}{% endif %}" method="post" id="{{ opts.model_name }}_form">
+<form {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="?language={{ language }}{% if request.GET.site %}&amp;site={{ request.GET.site }}{% endif %}{% if request.GET.parent_page %}&amp;parent_page={{ request.GET.parent_page }}{% endif %}{# parameter `parent_node` only for django CMS 4.1 support #}{% if request.GET.parent_node %}&amp;parent_node={{ request.GET.parent_node }}{% endif %}{%if request.GET.source %}&amp;source={{ request.GET.source }}{% endif %}" method="post" id="{{ opts.model_name }}_form">
 {% csrf_token %}
 {% block form_top %}{% endblock %}
 

djangocms_versioning/test_utils/polls/models.py

@@ -1,6 +1,7 @@
 from cms.models import CMSPlugin
 from django.db import models
 from django.urls import reverse
+from django.utils.translation import override
 
 
 class Poll(models.Model):
@@ -19,7 +20,8 @@ def __str__(self):
         return self.text
 
     def get_absolute_url(self):
-        return reverse("admin:polls_pollcontent_changelist")
+        with override(self.language):
+            return reverse("admin:polls_pollcontent_changelist")
 
     def get_preview_url(self):
         return reverse("admin:polls_pollcontent_preview", args=[self.id])

tests/test_handlers.py

@@ -46,7 +46,6 @@ def test_change_plugin(self):
         plugin = add_plugin(
             placeholder, "PollPlugin", version.content.language, poll=poll
         )
-        plugin.page.get_absolute_url = lambda *args, **kwargs: "/test_page/"  # Fake URL needed for URI
 
         dt = datetime(2016, 6, 6)
         with freeze_time(dt):

tests/test_menus.py

@@ -1,7 +1,7 @@
 from cms import constants as cms_constants
 from cms.test_utils.testcases import CMSTestCase
 from cms.toolbar.toolbar import CMSToolbar
-from cms.toolbar.utils import get_object_preview_url
+from cms.toolbar.utils import get_object_edit_url, get_object_preview_url
 from django.contrib.auth.models import AnonymousUser
 from django.template import Context, Template
 from django.test import RequestFactory
@@ -74,7 +74,7 @@ def _assert_node(self, node, version, edit_or_preview=True):
         self.assertEqual(node.title, content.title)
 
         if edit_or_preview:
-            self.assertEqual(node.url, get_object_preview_url(content))
+            self.assertIn(node.url, (get_object_preview_url(content), get_object_edit_url(content),))
         else:
             self.assertEqual(node.url, content.get_absolute_url())