wagtail 6.0.3__py3-none-any.whl → 6.0.4__py3-none-any.whl

wagtail/__init__.py

@@ -6,7 +6,7 @@ from wagtail.utils.version import get_semver_version, get_version
 
 # major.minor.patch.release.number
 # release must be one of alpha, beta, rc, or final
-VERSION = (6, 0, 3, "final", 1)
+VERSION = (6, 0, 4, "final", 1)
 
 __version__ = get_version(VERSION)
 

wagtail/admin/views/generic/__init__.py

@@ -15,6 +15,7 @@ from .mixins import (  # noqa: F401
 )
 from .models import (  # noqa: F401
     CopyView,
+    CopyViewMixin,
     CreateView,
     DeleteView,
     EditView,

wagtail/admin/views/generic/models.py

@@ -676,12 +676,18 @@ class CreateView(
         return super().form_invalid(form)
 
 
-class CopyView(CreateView):
+class CopyViewMixin:
     def get_object(self, queryset=None):
-        return get_object_or_404(self.model, pk=unquote(str(self.kwargs["pk"])))
+        return get_object_or_404(
+            self.model, pk=unquote(str(self.kwargs[self.pk_url_kwarg]))
+        )
 
-    def get_form_kwargs(self):
-        return {**super().get_form_kwargs(), "instance": self.get_object()}
+    def get_initial_form_instance(self):
+        return self.get_object()
+
+
+class CopyView(CopyViewMixin, CreateView):
+    pass
 
 
 class EditView(

wagtail/snippets/tests/test_snippets.py

@@ -35,7 +35,6 @@ from wagtail.snippets.action_menu import (
 )
 from wagtail.snippets.blocks import SnippetChooserBlock
 from wagtail.snippets.models import SNIPPET_MODELS, register_snippet
-from wagtail.snippets.views.snippets import CopyView
 from wagtail.snippets.widgets import (
     AdminSnippetChooser,
     SnippetChooserAdapter,
@@ -974,20 +973,29 @@ class TestSnippetCopyView(WagtailTestUtils, TestCase):
             StandardSnippet.snippet_viewset.get_url_name("copy"),
             args=(self.snippet.pk,),
         )
-        self.login()
+        self.user = self.login()
+
+    def test_without_permission(self):
+        self.user.is_superuser = False
+        self.user.save()
+        admin_permission = Permission.objects.get(
+            content_type__app_label="wagtailadmin", codename="access_admin"
+        )
+        self.user.user_permissions.add(admin_permission)
 
-    def test_simple(self):
+        response = self.client.get(self.url)
+        self.assertEqual(response.status_code, 302)
+        self.assertRedirects(response, reverse("wagtailadmin_home"))
+
+    def test_form_is_prefilled(self):
         response = self.client.get(self.url)
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, "wagtailsnippets/snippets/create.html")
 
-    def test_form_prefilled(self):
-        request = RequestFactory().get(self.url)
-        view = CopyView()
-        view.model = StandardSnippet
-        view.setup(request, pk=self.snippet.pk)
-
-        self.assertEqual(view._get_initial_form_instance(), self.snippet)
+        # Ensure form is prefilled
+        soup = self.get_soup(response.content)
+        text_input = soup.select_one('input[name="text"]')
+        self.assertEqual(text_input.attrs.get("value"), "Test snippet")
 
 
 @override_settings(WAGTAIL_I18N_ENABLED=True)

wagtail/snippets/views/snippets.py

@@ -5,7 +5,7 @@ from django.contrib.admin.utils import quote
 from django.core import checks
 from django.core.exceptions import ImproperlyConfigured, PermissionDenied
 from django.http import Http404
-from django.shortcuts import get_object_or_404, redirect
+from django.shortcuts import redirect
 from django.urls import path, re_path, reverse, reverse_lazy
 from django.utils.functional import cached_property
 from django.utils.text import capfirst
@@ -264,16 +264,8 @@ class CreateView(generic.CreateEditViewOptionalFeaturesMixin, generic.CreateView
         return context
 
 
-class CopyView(CreateView):
-    def get_object(self):
-        return get_object_or_404(self.model, pk=self.kwargs["pk"])
-
-    def _get_initial_form_instance(self):
-        instance = self.get_object()
-        # Set locale of the new instance
-        if self.locale:
-            instance.locale = self.locale
-        return instance
+class CopyView(generic.CopyViewMixin, CreateView):
+    pass
 
 
 class EditView(generic.CreateEditViewOptionalFeaturesMixin, generic.EditView):

{wagtail-6.0.3.dist-info → wagtail-6.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wagtail
-Version: 6.0.3
+Version: 6.0.4
 Summary: A Django content management system.
 Home-page: https://wagtail.org/
 Author: Wagtail core team + contributors

{wagtail-6.0.3.dist-info → wagtail-6.0.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-wagtail/__init__.py,sha256=AalpcuhGeGc_ikrSLxCWo5wCAh7hnaKFfzdXnh58BGY,724
+wagtail/__init__.py,sha256=qlk_KgJCF4VHS9RXzTg1O1YmSGd9NQhh0aWmbeByUqI,724
 wagtail/apps.py,sha256=38kXTdHoQzFnpUqDNxFpsqn2dut4V0u9rLOkhqCoYkc,713
 wagtail/compat.py,sha256=L41FhlX4xy5KgTdJ63smtM78mtKf1mxkPeOs8kyOwS0,538
 wagtail/coreutils.py,sha256=2eFnlfuyzu8wr5_u2j_zbrHhQDPxPfnaIlgRc4433J0,20660
@@ -931,13 +931,13 @@ wagtail/admin/views/bulk_action/__init__.py,sha256=vvb1oKmExfxl6cd6g7YaCO4LSwxWN
 wagtail/admin/views/bulk_action/base_bulk_action.py,sha256=UuidpHVm3uQTI6zRYxwSgxZNkAVP_XCWhkCEMW0Wu1s,5201
 wagtail/admin/views/bulk_action/dispatcher.py,sha256=fqhOJ3tyRwIDP474vewlsAq1FgP48AgKOvdiySxDlto,504
 wagtail/admin/views/bulk_action/registry.py,sha256=e9-rN9TdHUmRwDfTeauvPUjE6p3ipqReiuhxAhQDnJc,1640
-wagtail/admin/views/generic/__init__.py,sha256=QIxT31ii-FPvfww7r_TT1Dik_MNHBwSREC84zpe__EU,664
+wagtail/admin/views/generic/__init__.py,sha256=DmUsijsaRTmV5htoqydJ74OKuu4AiuhThvTFflCguok,683
 wagtail/admin/views/generic/base.py,sha256=iJKNGAd3orZOzLGviEfCF9rjdfo_hK3QCIDAAMkXcdQ,16705
 wagtail/admin/views/generic/chooser.py,sha256=pjOYGcYBHc1ZkZJ4LWcHkoGNQ7U7GdKBsJZ0vyOO4kc,18061
 wagtail/admin/views/generic/history.py,sha256=gsjOYx5aHv1s3klx_5VuZwsPqEaxV_8kucswr6MUTVE,10764
 wagtail/admin/views/generic/lock.py,sha256=dvZ613n3itNAhO3zdQzGRewm2kH-dyemx-LSuUC2AHM,1435
 wagtail/admin/views/generic/mixins.py,sha256=s17uj8lGDOI2zi3oH3HDJUem3tDddYQc3mrNxc-J_-I,28349
-wagtail/admin/views/generic/models.py,sha256=5RDc5QmY4dPC0lKGdE2eR3cQbE2jnc4rP8QXLvQbAig,50900
+wagtail/admin/views/generic/models.py,sha256=WurcJDa8xinxo0JmjrHXL8h2Pfi7tKfgMPiMDx2mZXM,50949
 wagtail/admin/views/generic/multiple_upload.py,sha256=rgf3uXZShyZ_2rnidfk_tnU4YhHcXyPwrIKMKWIk78s,13031
 wagtail/admin/views/generic/permissions.py,sha256=8WY3Pd3jt3sPH4CNaQqmhUvgb1YjD3fjIgkqh7zRjbc,1476
 wagtail/admin/views/generic/preview.py,sha256=9tvUJoz55b0bKY4vvfqnDMNke3TTeSPaEamvrICYR9Q,5655
@@ -3464,7 +3464,7 @@ wagtail/snippets/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 wagtail/snippets/tests/test_locking.py,sha256=QdaRVuX47tCbwoA62KYNJm9qxH33ekKs-nai5UeYDp4,25370
 wagtail/snippets/tests/test_management.py,sha256=GQw8HCZSJWny8giAUua_5-RstN7U_QGcsOkVuG72YHM,894
 wagtail/snippets/tests/test_preview.py,sha256=BpsAvmWJ2cX4zGZHbJg42lwIAztUTAgF_k9KRJWsSEw,19848
-wagtail/snippets/tests/test_snippets.py,sha256=1PYui84NWbZdACHgRMnhkhQsevfvHNIEdG87VN17xgo,214769
+wagtail/snippets/tests/test_snippets.py,sha256=-Oyh2bCgIAsmasdI_xjKQ6PiTPeKdGOlv79g4_nUJ-0,215147
 wagtail/snippets/tests/test_usage.py,sha256=2nAyuC5Nt3PbDnJgXNRAP_KDEt1gf_SGPiYL4IgmMWY,8076
 wagtail/snippets/tests/test_viewset.py,sha256=yCvlGerr5VbubC8I6W4ZlKS0yC7gMtsdA4cspski4JU,59972
 wagtail/snippets/tests/test_workflows.py,sha256=cbE1K46mCjb2yhaT5FGGKAXlZiirvWbKHVDAWpkrU4c,11493
@@ -3473,7 +3473,7 @@ wagtail/snippets/tests/test_bulk_actions/test_bulk_delete.py,sha256=h19bHzxx0FiP
 wagtail/snippets/tests/test_bulk_actions/test_custom_models.py,sha256=ymcv9FcRzaqA9P_QXIkCLDS2SBhV2Kc9jDrw1W51LZo,2156
 wagtail/snippets/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wagtail/snippets/views/chooser.py,sha256=Yhr19rpjifwu3YWE0k1ULZkcXWVKXP0mXc4o-ul7f88,2178
-wagtail/snippets/views/snippets.py,sha256=VentPtabHVJJhkG5g9Gu-105vKCA7J7Rikvs7LUdhIE,47429
+wagtail/snippets/views/snippets.py,sha256=mTCmGAkZ7BAtIg4Zb4iFesIChWMMa9w672iGDWVfWNQ,47138
 wagtail/templates/wagtailcore/login.html,sha256=OFcM7lpacqi4vTcHAwmh6-FjYl2fWEKKMJsqPYWhinM,998
 wagtail/templates/wagtailcore/page.html,sha256=731rpIL3MbL3oNEEIzrwQ-a7KgJITGnyCRJa5K8EuU4,343
 wagtail/templates/wagtailcore/password_required.html,sha256=cHsx0GRU8EaXeEyR_jigoKuf4gzS1leEuhFmoU4wmUM,726
@@ -3923,9 +3923,9 @@ wagtail/utils/urlpatterns.py,sha256=RDhVScxdm-RV4HSMjWElyrbEoTPsXu841_SKMgoFKtY,
 wagtail/utils/utils.py,sha256=UALGn0KOyqi5ZoXOozWX99ZPUsVZP51ET8d7sZ1jlm0,430
 wagtail/utils/version.py,sha256=40WGMIy8nSPQJFF01p7c38L444SexH2Cb-bQmR8ztXg,1478
 wagtail/utils/widgets.py,sha256=ibAvxHCjNw06bMlTD7wvrwmGEMNS3NzrnSKREGfPF44,1775
-wagtail-6.0.3.dist-info/LICENSE,sha256=0aiL7_RJ2YkOjscmRI7opwmuURrY6h8MR0B24nrdRQU,1512
-wagtail-6.0.3.dist-info/METADATA,sha256=15prseYYe8ZY201sM-jy7zJxSCF0YDR-j76oBBRjuis,3797
-wagtail-6.0.3.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-wagtail-6.0.3.dist-info/entry_points.txt,sha256=R14Z0xKoufNcDaku0EWDKM-K8J4ap0EImO8C-df8HVM,53
-wagtail-6.0.3.dist-info/top_level.txt,sha256=zcKgvuRTi0gSgVzJ1qMoERCwhQ_i0n9bkyxza3oh9as,8
-wagtail-6.0.3.dist-info/RECORD,,
+wagtail-6.0.4.dist-info/LICENSE,sha256=0aiL7_RJ2YkOjscmRI7opwmuURrY6h8MR0B24nrdRQU,1512
+wagtail-6.0.4.dist-info/METADATA,sha256=6Ef-2tXIk5xrp9ARl7sYEZGKSMc_jkQZl_d3dRMtl2g,3797
+wagtail-6.0.4.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+wagtail-6.0.4.dist-info/entry_points.txt,sha256=R14Z0xKoufNcDaku0EWDKM-K8J4ap0EImO8C-df8HVM,53
+wagtail-6.0.4.dist-info/top_level.txt,sha256=zcKgvuRTi0gSgVzJ1qMoERCwhQ_i0n9bkyxza3oh9as,8
+wagtail-6.0.4.dist-info/RECORD,,