Merge branch 'master' into feat/timed-publication

django-cms · fsbraun · Jul 3, 2023 · Jul 3, 2023 · Jul 3, 2023 · Sep 11, 2023
commit f3217c18a5fb36f168ce7bb0420bb142f92c4c89
diff --git a/djangocms_versioning/admin.py b/djangocms_versioning/admin.py
@@ -972,10 +972,17 @@ def publish_view(self, request, object_id):
 
         # Publish the version
         version.publish(request.user, visibility_start, visibility_end)
+
         # Display message
-        self.message_user(request, _("Version published"), level=messages.SUCCESS)
-        # Redirect
-        return redirect(version_list_url(version.content))
+        self.message_user(request, _("Version published"))
+
+        # Redirect to published?
+        if conf.ON_PUBLISH_REDIRECT == "published":
+            redirect_url = None
+            if hasattr(version.content, "get_absolute_url"):
+                redirect_url = version.content.get_absolute_url() or redirect_url
+
+        return redirect(redirect_url)
 
     def unpublish_view(self, request, object_id):
         """Unpublishes the specified version and redirects back to the

diff --git a/djangocms_versioning/cms_toolbars.py b/djangocms_versioning/cms_toolbars.py
                if version.check_publish.as_bool(self.request.user):
                    versioning_menu.add_modal_item(
                        _("Publish with time limits"),
                        url=reverse("admin:{app}_{model}_publish".format(
                            app=proxy_model._meta.app_label, model=proxy_model.__name__.lower()
                        ), args=(version.pk,)),
                        on_close=version_list_url(version.content)
                    )
                # Discard changes menu entry (wrt to source)
	if version.check_publish.as_bool(self.request.user):
	versioning_menu.add_modal_item(
	_("Publish with time limits"),
	url=reverse("admin:{app}_{model}_publish".format(
	app=proxy_model._meta.app_label, model=proxy_model.__name__.lower()
	), args=(version.pk,)),
Check failure on line 258 in djangocms_versioning/cms_toolbars.py GitHub Actions / ruff Ruff (UP032) djangocms_versioning/cms_toolbars.py:256:37: UP032 Use f-string instead of `format` call
	on_close=version_list_url(version.content)
	)
	# Discard changes menu entry (wrt to source)