wagtail 6.1rc1__py3-none-any.whl → 6.1.1__py3-none-any.whl

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
@@ -233,22 +233,6 @@ class CreateView(generic.CreateEditViewOptionalFeaturesMixin, generic.CreateView
     def _get_action_menu(self):
         return SnippetActionMenu(self.request, view=self.view_name, model=self.model)
 
-    def _get_initial_form_instance(self):
-        instance = self.model()
-
-        # Set locale of the new instance
-        if self.locale:
-            instance.locale = self.locale
-
-        return instance
-
-    def get_form_kwargs(self):
-        return {
-            **super().get_form_kwargs(),
-            "instance": self._get_initial_form_instance(),
-            "for_user": self.request.user,
-        }
-
     def get_side_panels(self):
         side_panels = [
             SnippetStatusSidePanel(
@@ -278,16 +262,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):
@@ -308,9 +284,6 @@ class EditView(generic.CreateEditViewOptionalFeaturesMixin, generic.EditView):
             locked_for_user=self.locked_for_user,
         )
 
-    def get_form_kwargs(self):
-        return {**super().get_form_kwargs(), "for_user": self.request.user}
-
     def get_side_panels(self):
         side_panels = [
             SnippetStatusSidePanel(

wagtail/test/testapp/migrations/0037_testpermissionedgenericsetting_and_more.py

@@ -0,0 +1,42 @@
+# Generated by Django 4.2.11 on 2024-04-25 15:51
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wagtailcore', '0093_uploadedfile'),
+        ('tests', '0036_complexdefaultstreampage'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='TestPermissionedGenericSetting',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=100)),
+                ('sensitive_email', models.EmailField(max_length=50)),
+            ],
+            options={
+                'permissions': [('can_edit_sensitive_email_generic_setting', 'Can edit sensitive email generic setting.')],
+            },
+        ),
+        migrations.AlterModelOptions(
+            name='featurecompletetoy',
+            options={'permissions': [('can_set_release_date', 'Can set release date')]},
+        ),
+        migrations.CreateModel(
+            name='TestPermissionedSiteSetting',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=100)),
+                ('sensitive_email', models.EmailField(max_length=50)),
+                ('site', models.OneToOneField(editable=False, on_delete=django.db.models.deletion.CASCADE, to='wagtailcore.site')),
+            ],
+            options={
+                'permissions': [('can_edit_sensitive_email_site_setting', 'Can edit sensitive email site setting.')],
+            },
+        ),
+    ]

wagtail/test/testapp/models.py

@@ -1685,6 +1685,49 @@ class TestGenericSetting(BaseGenericSetting):
     email = models.EmailField(max_length=50)
 
 
+@register_setting
+class TestPermissionedGenericSetting(BaseGenericSetting):
+    title = models.CharField(max_length=100)
+    sensitive_email = models.EmailField(max_length=50)
+
+    panels = [
+        FieldPanel("title"),
+        FieldPanel(
+            "sensitive_email",
+            permission="tests.can_edit_sensitive_email_generic_setting",
+        ),
+    ]
+
+    class Meta:
+        permissions = [
+            (
+                "can_edit_sensitive_email_generic_setting",
+                "Can edit sensitive email generic setting.",
+            ),
+        ]
+
+
+@register_setting
+class TestPermissionedSiteSetting(BaseSiteSetting):
+    title = models.CharField(max_length=100)
+    sensitive_email = models.EmailField(max_length=50)
+
+    panels = [
+        FieldPanel("title"),
+        FieldPanel(
+            "sensitive_email", permission="tests.can_edit_sensitive_email_site_setting"
+        ),
+    ]
+
+    class Meta:
+        permissions = [
+            (
+                "can_edit_sensitive_email_site_setting",
+                "Can edit sensitive email site setting.",
+            ),
+        ]
+
+
 @register_setting
 class ImportantPagesSiteSetting(BaseSiteSetting):
     sign_up_page = models.ForeignKey(
@@ -2274,6 +2317,9 @@ class FeatureCompleteToy(index.Indexed, models.Model):
     def __str__(self):
         return f"{self.name} ({self.release_date})"
 
+    class Meta:
+        permissions = [("can_set_release_date", "Can set release date")]
+
 
 class PurgeRevisionsProtectedTestModel(models.Model):
     revision = models.OneToOneField(

wagtail/test/testapp/views.py

@@ -229,7 +229,7 @@ class FeatureCompleteToyViewSet(ModelViewSet):
 
     panels = [
         FieldPanel("name"),
-        FieldPanel("release_date"),
+        FieldPanel("release_date", permission="tests.can_set_release_date"),
     ]
 
 

wagtail/tests/test_rich_text.py

@@ -191,6 +191,28 @@ This is another image: <embed embedtype="image" id="2" format="left" />
         """
             )
 
+    def test_expand_db_html_mixed_link_types(self):
+        self.assertEqual(
+            expand_db_html(
+                '<a href="https://wagtail.org/">foo</a>'
+                '<a linktype="page" id="3">bar</a>'
+            ),
+            '<a href="https://wagtail.org/">foo</a><a href="/events/">bar</a>',
+        )
+
+        self.assertEqual(
+            expand_db_html(
+                '<a linktype="page" id="3">page</a>'
+                '<a linktype="document" id="1">document</a>'
+                '<a linktype="page" id="3">page</a>'
+            ),
+            (
+                '<a href="/events/">page</a>'
+                '<a href="/documents/1/test.pdf">document</a>'
+                '<a href="/events/">page</a>'
+            ),
+        )
+
 
 class TestRichTextValue(TestCase):
     fixtures = ["test.json"]
@@ -274,6 +296,12 @@ class TestLinkRewriterTagReplacing(TestCase):
         self.assertNotEqual(link_with_custom_linktype, '<a href="https://wagtail.org">')
         self.assertEqual(link_with_custom_linktype, "<a>")
 
+        # And should properly handle mixed linktypes.
+        self.assertEqual(
+            rewriter('<a href="https://wagtail.org/"><a linktype="page" id="3">'),
+            '<a href="https://wagtail.org/"><a href="/article/3">',
+        )
+
     def test_supported_type_should_follow_given_rules(self):
         # we always have `page` rules by default
         rules = {

wagtail/users/locale/af/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-24 13:51+0000\n"
+"POT-Creation-Date: 2024-05-02 10:04+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Afrikaans (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/users/locale/ar/LC_MESSAGES/django.po

@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-24 13:51+0000\n"
+"POT-Creation-Date: 2024-05-02 10:04+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
 "Last-Translator: Younes Oumakhou, 2022\n"
 "Language-Team: Arabic (http://app.transifex.com/torchbox/wagtail/language/"
@@ -103,6 +103,9 @@ msgstr "اختر منطقتك الزمنية الحالية"
 msgid "profile picture"
 msgstr "الصوره الشخصيه"
 
+msgid "Default"
+msgstr "عادي"
+
 msgid "user profile"
 msgstr "ملف تعريفي للمستخدم"
 
@@ -195,22 +198,6 @@ msgstr "أضف مستخدم"
 msgid "Delete user"
 msgstr "إحذف المستخدم"
 
-#, python-format
-msgid "Sorry, no users match \"<em>%(query_string)s</em>\""
-msgstr "عذرًا ، لا يوجد مستخدمون يتطابقون مع \"<em>%(query_string)s</em>\""
-
-msgid "Username"
-msgstr "إسم المستخدم"
-
-msgid "Status"
-msgstr "الحالة"
-
-msgid "Last Login"
-msgstr "آخر تسجيل دخول"
-
-msgid "Admin"
-msgstr "إدارة"
-
 msgid "Active"
 msgstr "نشيط"
 
@@ -241,12 +228,24 @@ msgstr "من غير الممكن حفظ المجموعة بسبب أخطاء"
 msgid "Group '%(object)s' deleted."
 msgstr "تم حذف المجموعة '%(object)s'."
 
+msgid "Group"
+msgstr "جماعة"
+
 msgid "Add a user"
 msgstr "أضف مستخدم"
 
 msgid "Users"
 msgstr "مستخدمين"
 
+msgid "Username"
+msgstr "إسم المستخدم"
+
+msgid "Admin"
+msgstr "إدارة"
+
+msgid "Status"
+msgstr "الحالة"
+
 #, python-format
 msgid "User '%(object)s' updated."
 msgstr "تم تحديث المستخدم '%(object)s'."
@@ -257,6 +256,3 @@ msgstr "من غير الممكن حفظ المستخدم بسبب أخطاء"
 #, python-format
 msgid "User '%(object)s' deleted."
 msgstr "تم حذف المستخدم '%(object)s'."
-
-msgid "Edit"
-msgstr "تحرير"

wagtail/users/locale/az_AZ/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-24 13:51+0000\n"
+"POT-Creation-Date: 2024-05-02 10:04+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Azerbaijani (Azerbaijan) (http://app.transifex.com/torchbox/"

wagtail/users/locale/be/LC_MESSAGES/django.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-24 13:51+0000\n"
+"POT-Creation-Date: 2024-05-02 10:04+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
 "Last-Translator: Andrei Satsevich, 2023\n"
 "Language-Team: Belarusian (http://app.transifex.com/torchbox/wagtail/"
@@ -128,6 +128,9 @@ msgstr "Цёмная"
 msgid "admin theme"
 msgstr "каляровая тэма адміністратара"
 
+msgid "Default"
+msgstr "Па змаўчанні"
+
 msgid "user profile"
 msgstr "профіль карыстальніка"
 
@@ -243,9 +246,6 @@ msgstr "Вы сапраўды хочаце выдаліць гэты гурт?"
 msgid "Add group"
 msgstr "Дадаць гурт"
 
-msgid "View users in this group"
-msgstr "Прагляд карыстальнікаў групы"
-
 msgid "Save"
 msgstr "Захаваць"
 
@@ -318,20 +318,6 @@ msgstr "Выдаліць карыстальніка"
 msgid "Select all users in listing"
 msgstr "Выбраць усіх карыстальнікаў у спісе"
 
-#, python-format
-msgid "Sorry, no users match \"<em>%(query_string)s</em>\""
-msgstr ""
-"Прабачце, не знойдзена подыходзячых карыстальнікаў \"<em>%(query_string)s</"
-"em>\""
-
-#, python-format
-msgid ""
-"The %(group_name)s group has no users configured. Why not <a "
-"href=\"%(wagtailusers_add_url)s\">add some</a>?"
-msgstr ""
-"Гурт %(group_name)s не ўтрымлівае карыстальнікаў. Чаму б не <a "
-"href=\"%(wagtailusers_add_url)s\">дадаць некалькі </a>?"
-
 #, python-format
 msgid ""
 "There are no users configured. Why not <a "
@@ -340,27 +326,6 @@ msgstr ""
 "Карыстальнікі не сканфігураваны. <a href=\"%(wagtailusers_add_url)s\"> "
 "дадаць карыстальніка </a>?"
 
-msgid "Username"
-msgstr "Імя карыстальніка"
-
-msgid "Access level"
-msgstr "Узровень доступу"
-
-msgid "Status"
-msgstr "Статус"
-
-msgid "Last Login"
-msgstr "Апошні ўваход"
-
-msgid "Admin"
-msgstr "Адміністратар"
-
-msgid "Active"
-msgstr "Актыўны"
-
-msgid "Inactive"
-msgstr "Неактыўны"
-
 #, python-format
 msgid "user %(id)s (deleted)"
 msgstr "карыстальнік %(id)s (выдалены)"
@@ -387,6 +352,12 @@ msgstr[1] "%(num_parent_objects)d карыстальніка выдалілі"
 msgstr[2] "%(num_parent_objects)d карыстальнікаў выдалілі"
 msgstr[3] "%(num_parent_objects)d карыстальнікаў выдалілі"
 
+msgid "Active"
+msgstr "Актыўны"
+
+msgid "Inactive"
+msgstr "Неактыўны"
+
 msgid "Mark as active"
 msgstr "Пазначыць як актыўны"
 
@@ -429,6 +400,9 @@ msgstr "Адноўлены '%(object)s' гурт."
 msgid "The group could not be saved due to errors."
 msgstr "Гурт не можа быць захавана з-за памылкі."
 
+msgid "View users in this group"
+msgstr "Прагляд карыстальнікаў групы"
+
 #, python-format
 msgid "Group '%(object)s' deleted."
 msgstr "Гурт '%(object)s' выдалены."
@@ -439,6 +413,18 @@ msgstr "Дадаць карыстальніка"
 msgid "Users"
 msgstr "Карыстальнікі"
 
+msgid "Username"
+msgstr "Імя карыстальніка"
+
+msgid "Admin"
+msgstr "Адміністратар"
+
+msgid "Access level"
+msgstr "Узровень доступу"
+
+msgid "Status"
+msgstr "Статус"
+
 #, python-format
 msgid "User '%(object)s' created."
 msgstr "Карыстальнік '%(object)s' створан."
@@ -453,14 +439,3 @@ msgstr "Карыстальнік не можа быць захавана з-за
 #, python-format
 msgid "User '%(object)s' deleted."
 msgstr "Карыстальнік '%(object)s' выдалены."
-
-msgid "Edit"
-msgstr "Рэдактаванне"
-
-#, python-format
-msgid "Edit user '%(name)s'"
-msgstr "Рэдагаваць карыстальніка '%(name)s'"
-
-#, python-format
-msgid "Delete user '%(name)s'"
-msgstr "Выдаліць карыстальніка '%(name)s'"

wagtail/users/locale/bg/LC_MESSAGES/django.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-24 13:51+0000\n"
+"POT-Creation-Date: 2024-05-02 10:04+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
 "Last-Translator: Lyuboslav  Petrov <petrov.lyuboslav@gmail.com>, 2014\n"
 "Language-Team: Bulgarian (http://app.transifex.com/torchbox/wagtail/language/"
@@ -77,15 +77,6 @@ msgstr "Роля"
 msgid "Add user"
 msgstr "Добави потребител"
 
-msgid "Username"
-msgstr "Потребителско име"
-
-msgid "Status"
-msgstr "Статус"
-
-msgid "Admin"
-msgstr "Админ"
-
 msgid "Active"
 msgstr "Активен"
 
@@ -98,12 +89,18 @@ msgstr "Добави потребител"
 msgid "Users"
 msgstr "Потребители"
 
+msgid "Username"
+msgstr "Потребителско име"
+
+msgid "Admin"
+msgstr "Админ"
+
+msgid "Status"
+msgstr "Статус"
+
 #, python-format
 msgid "User '%(object)s' updated."
 msgstr "Потребител '%(object)s' обновен."
 
 msgid "The user could not be saved due to errors."
 msgstr "Потребителя не можеше да бъде запазен заради грешки."
-
-msgid "Edit"
-msgstr "Редакция"

wagtail/users/locale/bn/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-24 13:51+0000\n"
+"POT-Creation-Date: 2024-05-02 10:04+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bengali (http://app.transifex.com/torchbox/wagtail/language/"
@@ -44,6 +44,3 @@ msgstr "লক করুন "
 
 msgid "Unlock"
 msgstr "আনলক"
-
-msgid "Edit"
-msgstr "সম্পাদনা করুন"