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

wagtail/contrib/search_promotions/tests.py

@@ -2,6 +2,7 @@ import json
 from datetime import date, datetime, timedelta
 from io import StringIO
 
+from django.contrib.auth.models import Permission
 from django.core import management
 from django.test import TestCase
 from django.urls import reverse
@@ -172,7 +173,7 @@ class TestGetSearchPromotionsTemplateTag(TestCase):
 
 class TestSearchPromotionsIndexView(WagtailTestUtils, TestCase):
     def setUp(self):
-        self.login()
+        self.user = self.login()
 
     def test_simple(self):
         response = self.client.get(reverse("wagtailsearchpromotions:index"))
@@ -230,7 +231,7 @@ class TestSearchPromotionsIndexView(WagtailTestUtils, TestCase):
         self.assertTemplateUsed(response, "wagtailsearchpromotions/index.html")
 
         # Check that we got the correct page
-        self.assertEqual(response.context["queries"].number, 2)
+        self.assertEqual(response.context["page_obj"].number, 2)
 
     def test_pagination_invalid(self):
         self.make_search_picks()
@@ -252,6 +253,41 @@ class TestSearchPromotionsIndexView(WagtailTestUtils, TestCase):
         # Check response
         self.assertEqual(response.status_code, 404)
 
+    def test_num_queries(self):
+        url = reverse("wagtailsearchpromotions:index")
+        self.make_search_picks()
+        # Warm up the cache
+        self.client.get(url)
+
+        # Number of queries with the current number of search picks
+        with self.assertNumQueries(11):
+            self.client.get(url)
+
+        # Add more SearchPromotions and QueryDailyHits to some of the queries
+        today = date.today()
+        for i in range(20):
+            query = Query.get("query " + str(i))
+            promos = [
+                SearchPromotion(
+                    query=query,
+                    page_id=j % 2 + 1,
+                    sort_order=j,
+                    description=f"Search pick {j}",
+                )
+                for j in range(5)
+            ]
+            hits = [
+                QueryDailyHits(query=query, date=today - timedelta(days=j), hits=j)
+                for j in range(5)
+            ]
+            SearchPromotion.objects.bulk_create(promos)
+            QueryDailyHits.objects.bulk_create(hits)
+
+        # Number of queries after the addition of more search picks and hits
+        # should remain the same (no N+1 queries)
+        with self.assertNumQueries(11):
+            self.client.get(url)
+
     def test_results_are_ordered_alphabetically(self):
         self.make_search_picks()
         SearchPromotion.objects.create(
@@ -260,6 +296,13 @@ class TestSearchPromotionsIndexView(WagtailTestUtils, TestCase):
             sort_order=0,
             description="ooh, it's a snake",
         )
+        # Add another one to make sure it's not ordered descending by pk
+        SearchPromotion.objects.create(
+            query=Query.get("beloved snake"),
+            page_id=1,
+            sort_order=0,
+            description="beloved snake goes ssSSSS",
+        )
 
         response = self.client.get(reverse("wagtailsearchpromotions:index"))
 
@@ -269,6 +312,37 @@ class TestSearchPromotionsIndexView(WagtailTestUtils, TestCase):
 
         # "aargh snake" should be the first result alphabetically
         self.assertEqual(response.context["queries"][0].query_string, "aaargh snake")
+        self.assertEqual(response.context["queries"][1].query_string, "beloved snake")
+
+    def test_multiple_searchpromotions(self):
+        today = date.today()
+        for i in range(10):
+            Query.get("root page").add_hit(date=today - timedelta(days=i))
+        SearchPromotion.objects.create(
+            query=Query.get("root page"),
+            page_id=1,
+            sort_order=0,
+            description="First search pick",
+        )
+        SearchPromotion.objects.create(
+            query=Query.get("root page"),
+            page_id=2,
+            sort_order=0,
+            description="Second search pick",
+        )
+        response = self.client.get(reverse("wagtailsearchpromotions:index"))
+
+        self.assertContains(response, "<td>10</td>", html=True)
+        self.assertEqual(Query.get("root page").hits, 10)
+
+        soup = self.get_soup(response.content)
+        root_page_edit_url = reverse("wagtailadmin_pages:edit", args=(1,))
+        homepage_edit_url = reverse("wagtailadmin_pages:edit", args=(2,))
+        root_page_edit_link = soup.select_one(f'a[href="{root_page_edit_url}"]')
+        homepage_edit_link = soup.select_one(f'a[href="{homepage_edit_url}"]')
+        self.assertIsNotNone(root_page_edit_link)
+        self.assertIsNotNone(homepage_edit_link)
+        self.assertEqual(Query.get("root page").editors_picks.count(), 2)
 
     def test_results_ordering(self):
         self.make_search_picks()
@@ -310,29 +384,68 @@ class TestSearchPromotionsIndexView(WagtailTestUtils, TestCase):
         # ordered by querystring (reversed)
         response = self.client.get(url + "?ordering=-query_string")
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.context["queries"][0].query_string, "zyzzyvas")
+        self.assertEqual(response.context["page_obj"][0].query_string, "zyzzyvas")
 
         # last page, still ordered by query string (reversed)
         response = self.client.get(url + "?ordering=-query_string&p=3")
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.context["queries"][-1].query_string, "aardwolf")
+        self.assertEqual(response.context["page_obj"][-1].query_string, "aardwolf")
 
         # ordered by querystring (not reversed)
         response = self.client.get(url + "?ordering=query_string")
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.context["queries"][0].query_string, "aardwolf")
+        self.assertEqual(response.context["page_obj"][0].query_string, "aardwolf")
 
         # ordered by sum of daily hits (reversed)
         response = self.client.get(url + "?ordering=-views")
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.context["queries"][0].query_string, "optimal")
-        self.assertEqual(response.context["queries"][1].query_string, "suboptimal")
+        self.assertEqual(response.context["page_obj"][0].query_string, "optimal")
+        self.assertEqual(response.context["page_obj"][1].query_string, "suboptimal")
 
         # ordered by sum of daily hits, last page (not reversed)
         response = self.client.get(url + "?ordering=views&p=3")
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.context["queries"][-1].query_string, "optimal")
-        self.assertEqual(response.context["queries"][-2].query_string, "suboptimal")
+        self.assertEqual(response.context["page_obj"][-1].query_string, "optimal")
+        self.assertEqual(response.context["page_obj"][-2].query_string, "suboptimal")
+
+    def test_get_with_no_permission(self):
+        self.user.is_superuser = False
+        self.user.save()
+        # Only basic access_admin permission is given
+        self.user.user_permissions.add(
+            Permission.objects.get(
+                content_type__app_label="wagtailadmin",
+                codename="access_admin",
+            )
+        )
+
+        response = self.client.get(reverse("wagtailsearchpromotions:index"))
+        self.assertEqual(response.status_code, 302)
+        self.assertRedirects(response, reverse("wagtailadmin_home"))
+
+    def test_get_with_edit_permission_only(self):
+        self.user.is_superuser = False
+        self.user.save()
+        # Only basic access_admin permission is given
+        self.user.user_permissions.add(
+            Permission.objects.get(
+                content_type__app_label="wagtailadmin",
+                codename="access_admin",
+            ),
+            Permission.objects.get(
+                content_type__app_label="wagtailsearchpromotions",
+                codename="change_searchpromotion",
+            ),
+        )
+
+        response = self.client.get(reverse("wagtailsearchpromotions:index"))
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "wagtailsearchpromotions/index.html")
+
+        soup = self.get_soup(response.content)
+        add_url = reverse("wagtailsearchpromotions:add")
+        # Should not render add link
+        self.assertIsNone(soup.select_one(f'a[href="{add_url}"]'))
 
 
 class TestSearchPromotionsAddView(WagtailTestUtils, TestCase):

wagtail/contrib/search_promotions/views.py

@@ -6,80 +6,81 @@ from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.urls import reverse
 from django.utils.translation import gettext as _
-from django.views.decorators.vary import vary_on_headers
+from django.utils.translation import gettext_lazy
 
 from wagtail.admin import messages
-from wagtail.admin.auth import any_permission_required, permission_required
+from wagtail.admin.auth import permission_required
 from wagtail.admin.forms.search import SearchForm
 from wagtail.admin.modal_workflow import render_modal_workflow
+from wagtail.admin.ui.tables import Column, RelatedObjectsColumn, TitleColumn
+from wagtail.admin.views import generic
 from wagtail.contrib.search_promotions import forms, models
-from wagtail.contrib.search_promotions.models import Query
+from wagtail.contrib.search_promotions.models import Query, SearchPromotion
 from wagtail.log_actions import log
+from wagtail.permission_policies.base import ModelPermissionPolicy
 from wagtail.search.utils import normalise_query_string
 
 
-@any_permission_required(
-    "wagtailsearchpromotions.add_searchpromotion",
-    "wagtailsearchpromotions.change_searchpromotion",
-    "wagtailsearchpromotions.delete_searchpromotion",
-)
-@vary_on_headers("X-Requested-With")
-def index(request):
-    # Ordering
-    valid_ordering = ["query_string", "-query_string", "views", "-views"]
-    ordering = valid_ordering[0]
-
-    if "ordering" in request.GET and request.GET["ordering"] in valid_ordering:
-        ordering = request.GET["ordering"]
-
-    # Query
-    queries = Query.objects.filter(editors_picks__isnull=False).distinct()
-
-    if "views" in ordering:
-        queries = queries.annotate(views=functions.Coalesce(Sum("daily_hits__hits"), 0))
-
-    queries = queries.order_by(ordering)
-
-    # Search
-    is_searching = False
-    query_string = request.GET.get("q", "")
-
-    if query_string:
-        queries = queries.filter(query_string__icontains=query_string)
-        is_searching = True
-
-    # Paginate
-    paginator = Paginator(queries, per_page=20)
-    try:
-        queries = paginator.page(request.GET.get("p", 1))
-    except InvalidPage:
-        raise Http404
-
-    if request.headers.get("x-requested-with") == "XMLHttpRequest":
-        return TemplateResponse(
-            request,
-            "wagtailsearchpromotions/results.html",
-            {
-                "is_searching": is_searching,
-                "ordering": ordering,
-                "queries": queries,
-                "query_string": query_string,
-            },
-        )
-    else:
-        return TemplateResponse(
-            request,
-            "wagtailsearchpromotions/index.html",
-            {
-                "is_searching": is_searching,
-                "ordering": ordering,
-                "queries": queries,
-                "query_string": query_string,
-                "search_form": SearchForm(
-                    data={"q": query_string} if query_string else None,
-                ),
-            },
-        )
+class SearchPromotionColumn(RelatedObjectsColumn):
+    cell_template_name = "wagtailsearchpromotions/search_promotion_column.html"
+
+
+class IndexView(generic.IndexView):
+    model = Query
+    template_name = "wagtailsearchpromotions/index.html"
+    results_template_name = "wagtailsearchpromotions/index_results.html"
+    context_object_name = "queries"
+    page_title = gettext_lazy("Search Terms")
+    header_icon = "pick"
+    paginate_by = 20
+    permission_policy = ModelPermissionPolicy(SearchPromotion)
+    index_url_name = "wagtailsearchpromotions:index"
+    index_results_url_name = "wagtailsearchpromotions:index_results"
+    _show_breadcrumbs = True
+    search_fields = ["query_string"]
+    default_ordering = "query_string"
+    add_url_name = "wagtailsearchpromotions:add"
+    add_item_label = gettext_lazy("Add new promoted result")
+    columns = [
+        TitleColumn(
+            "query_string",
+            label=gettext_lazy("Search term(s)"),
+            width="40%",
+            url_name="wagtailsearchpromotions:edit",
+            sort_key="query_string",
+        ),
+        SearchPromotionColumn(
+            "editors_picks",
+            label=gettext_lazy("Promoted results"),
+            width="40%",
+        ),
+        Column(
+            "views",
+            label=gettext_lazy("Views (past week)"),
+            width="20%",
+            sort_key="views",
+        ),
+    ]
+
+    def get_base_queryset(self):
+        # Use a subquery to filter out the Query objects that do not have a
+        # SearchPromotion instead of using .filter(editors_picks__isnull=False).
+        # The latter would use a JOIN which would result in duplicate rows before
+        # the sum is calculated, causing the sum to be incorrect.
+        has_promotions = SearchPromotion.objects.values_list("query_id", flat=True)
+        queryset = self.model.objects.filter(pk__in=has_promotions)
+
+        # Prevent N+1 queries by annotating the sum instead of using the
+        # Query.hits property and prefetching the related editors_picks.
+        queryset = queryset.annotate(
+            views=functions.Coalesce(Sum("daily_hits__hits"), 0)
+        ).prefetch_related("editors_picks", "editors_picks__page")
+        return queryset
+
+    def get_breadcrumbs_items(self):
+        breadcrumbs = super().get_breadcrumbs_items()
+        breadcrumbs[-1]["label"] = _("Promoted search results")
+        return breadcrumbs
 
 
 def save_searchpicks(query, new_query, searchpicks_formset):

wagtail/contrib/settings/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-24 13:51+0000\n"
+"POT-Creation-Date: 2024-04-18 17:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -48,11 +48,11 @@ msgstr ""
 msgid "This setting could not be opened because there is no site defined."
 msgstr ""
 
-#: views.py:84
+#: views.py:83
 msgid "The setting could not be saved due to errors."
 msgstr ""
 
-#: views.py:147
+#: views.py:149
 #, python-format
 msgid "%(setting_type)s updated."
 msgstr ""

wagtail/contrib/settings/locale/he_IL/LC_MESSAGES/django.po

@@ -20,8 +20,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he_IL\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % "
-"1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
+"Plural-Forms: nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % "
+"1 == 0) ? 1: 2;\n"
 
 msgid "default"
 msgstr "ברירת מחדל"

wagtail/contrib/settings/locale/tr/LC_MESSAGES/django.po

@@ -4,7 +4,7 @@
 #
 # Translators:
 # Ahmet Sarıcan <asarican@gmail.com>, 2019
-# Cihad GÜNDOĞDU <cihadgundogdu@gmail.com>, 2016,2019
+# Cihad GÜNDOĞDU <cihadgundogdu@gmail.com>, 2016,2019,2024
 # Fatih Koç koç <fatihinemaili@gmail.com>, 2021
 # Halim Turan <halim_turan_61@hotmail.com>, 2022
 # José Luis <alagunajs@gmail.com>, 2017
@@ -17,7 +17,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-01-24 13:51+0000\n"
 "PO-Revision-Date: 2016-03-01 19:20+0000\n"
-"Last-Translator: Saadettin Yasir AKEL <yasirakel@gmail.com>, 2016\n"
+"Last-Translator: Cihad GÜNDOĞDU <cihadgundogdu@gmail.com>, 2016,2019,2024\n"
 "Language-Team: Turkish (http://app.transifex.com/torchbox/wagtail/language/"
 "tr/)\n"
 "MIME-Version: 1.0\n"
@@ -29,6 +29,10 @@ msgstr ""
 msgid "default"
 msgstr "varsayılan"
 
+#, python-format
+msgid "%(site_setting)s for %(site)s"
+msgstr "%(site)s için %(site_setting)s"
+
 msgid "Site"
 msgstr "Site"
 

wagtail/contrib/settings/registry.py

@@ -67,12 +67,17 @@ class GenericSettingAdminURLFinder(ModelAdminURLFinder):
 
 
 class Registry(list):
-    def register(self, model, **kwargs):
+    def __init__(self):
+        self._model_icons = {}
+
+    def register(self, model, icon="cog", **kwargs):
         from .models import BaseGenericSetting, BaseSiteSetting
 
         """
         Register a model as a setting, adding it to the wagtail admin menu
         """
+        if icon:
+            self._model_icons[model] = icon
 
         # Don't bother registering this if it is already registered
         if model in self:
@@ -82,7 +87,7 @@ class Registry(list):
         # Register a new menu item in the settings menu
         @hooks.register("register_settings_menu_item")
         def menu_hook():
-            return SettingMenuItem(model, **kwargs)
+            return SettingMenuItem(model, icon=self._model_icons.get(model), **kwargs)
 
         @hooks.register("register_permissions")
         def permissions_hook():
@@ -113,13 +118,13 @@ class Registry(list):
 
         return model
 
-    def register_decorator(self, model=None, **kwargs):
+    def register_decorator(self, model=None, icon="cog", **kwargs):
         """
         Register a model as a setting in the Wagtail admin
         """
         if model is None:
-            return lambda model: self.register(model, **kwargs)
-        return self.register(model, **kwargs)
+            return lambda model: self.register(model, icon=icon, **kwargs)
+        return self.register(model, icon=icon, **kwargs)
 
     def get_by_natural_key(self, app_label, model_name):
         """

wagtail/contrib/settings/tests/generic/test_admin.py

@@ -126,6 +126,15 @@ class TestGenericSettingEditView(BaseTestGenericSettingView):
         )
         self.assertEqual(response.status_code, 404)
 
+    def test_register_with_icon(self):
+        edit_url = reverse("wagtailsettings:edit", args=("tests", "IconGenericSetting"))
+        edit_response = self.client.get(edit_url, follow=True)
+
+        self.assertContains(
+            edit_response,
+            """<svg class="icon icon-icon-setting-tag w-header__glyph" aria-hidden="true"><use href="#icon-icon-setting-tag"></use></svg>""",
+        )
+
     def test_edit_invalid(self):
         response = self.post(post_data={"foo": "bar"})
         self.assertContains(response, "The setting could not be saved due to errors.")

wagtail/contrib/settings/tests/site_specific/test_admin.py

@@ -120,12 +120,21 @@ class TestSiteSettingEditView(BaseTestSiteSettingView):
         response = self.get()
         self.assertEqual(response.status_code, 200)
 
-    def test_non_existant_model(self):
+    def test_non_existent_model(self):
         response = self.client.get(
             reverse("wagtailsettings:edit", args=["test", "foo", 1])
         )
         self.assertEqual(response.status_code, 404)
 
+    def test_register_with_icon(self):
+        edit_url = reverse("wagtailsettings:edit", args=("tests", "IconGenericSetting"))
+        edit_response = self.client.get(edit_url, follow=True)
+
+        self.assertContains(
+            edit_response,
+            """<svg class="icon icon-icon-setting-tag w-header__glyph" aria-hidden="true"><use href="#icon-icon-setting-tag"></use></svg>""",
+        )
+
     def test_edit_invalid(self):
         response = self.post(post_data={"foo": "bar"})
         self.assertContains(response, "The setting could not be saved due to errors.")

wagtail/contrib/settings/tests/site_specific/test_model.py

@@ -74,7 +74,7 @@ class SettingModelTestCase(SiteSettingsTestMixin, TestCase):
     def test_importantpages_object_is_pickleable(self):
         obj = self._create_importantpagessitesetting_object()
         # Triggers creation of the InvokeViaAttributeShortcut instance,
-        # and also gives us a value we can use for comparisson
+        # and also gives us a value we can use for comparison
         signup_page_url = obj.page_url.sign_up_page
 
         # Attempt to pickle ImportantPages instance
@@ -82,7 +82,7 @@ class SettingModelTestCase(SiteSettingsTestMixin, TestCase):
             pickled = pickle.dumps(obj, -1)
         except Exception as e:  # noqa: BLE001
             raise AssertionError(
-                f"An error occured when attempting to pickle {obj!r}: {e}"
+                f"An error occurred when attempting to pickle {obj!r}: {e}"
             )
 
         # Now unpickle the pickled ImportantPages
@@ -90,7 +90,7 @@ class SettingModelTestCase(SiteSettingsTestMixin, TestCase):
             unpickled = pickle.loads(pickled)
         except Exception as e:  # noqa: BLE001
             raise AssertionError(
-                f"An error occured when attempting to unpickle {obj!r}: {e}"
+                f"An error occurred when attempting to unpickle {obj!r}: {e}"
             )
 
         # Using 'page_url' should create a new InvokeViaAttributeShortcut

wagtail/contrib/settings/tests/site_specific/test_templates.py

@@ -174,7 +174,7 @@ class TestTemplateTag(TemplateTestCase):
 
         self.assertEqual(template.render(context), "")
 
-    def test_get_settings_variable_assigment_use_default(self):
+    def test_get_settings_variable_assignment_use_default(self):
         """
         Check that assigning the setting to a context variable with
         {% get_settings use_default_site=True as wagtail_settings %} works.

wagtail/contrib/settings/views.py

@@ -80,7 +80,6 @@ def redirect_to_relevant_instance(request, app_name, model_name):
 
 class EditView(generic.EditView):
     template_name = "wagtailsettings/edit.html"
-    header_icon = "cogs"
     error_message = gettext_lazy("The setting could not be saved due to errors.")
 
     def setup(self, request, app_name, model_name, *args, **kwargs):
@@ -129,11 +128,14 @@ class EditView(generic.EditView):
 
         media = form.media + edit_handler.media
 
+        header_icon = registry._model_icons.get(self.model)
+
         context.update(
             {
                 "edit_handler": edit_handler,
                 "site_switcher": site_switcher,
                 "media": media,
+                "header_icon": header_icon,
             }
         )
 

wagtail/contrib/simple_translation/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-24 13:51+0000\n"
+"POT-Creation-Date: 2024-04-18 17:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

wagtail/contrib/simple_translation/tests/test_wagtail_hooks.py

@@ -160,7 +160,7 @@ class TestConstructSyncedPageTreeListHook(Utils):
         # Login to access the admin
         self.login()
 
-        # Make sur the French homepage is published/live
+        # Make sure the French homepage is published/live
         self.fr_homepage.live = True
         self.fr_homepage.save()
         self.assertTrue(self.en_homepage.live)
@@ -259,7 +259,7 @@ class TestMovingTranslatedPages(Utils):
         self.assertEqual(self.en_blog_post.get_parent().id, self.en_blog_index.id)
 
         # Confirm the fr and de blog post pages are under the blog index page
-        # We'll confirm these have not moved after ther POST request.
+        # We'll confirm these have not moved after the POST request.
         original_translated_parent_ids = [
             p.id for p in self.en_blog_index.get_translations()
         ]

wagtail/contrib/styleguide/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-24 13:51+0000\n"
+"POT-Creation-Date: 2024-04-18 17:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,26 +34,26 @@ msgstr ""
 msgid "Delete image"
 msgstr ""
 
-#: views.py:105 wagtail_hooks.py:20
+#: views.py:110 wagtail_hooks.py:20
 msgid "Styleguide"
 msgstr ""
 
-#: views.py:113
+#: views.py:118
 msgid "Success message"
 msgstr ""
 
-#: views.py:115 views.py:123 views.py:131
+#: views.py:120 views.py:128 views.py:136
 msgid "View live"
 msgstr ""
 
-#: views.py:116 views.py:124 views.py:132
+#: views.py:121 views.py:129 views.py:137
 msgid "Edit"
 msgstr ""
 
-#: views.py:121
+#: views.py:126
 msgid "Warning message"
 msgstr ""
 
-#: views.py:129
+#: views.py:134
 msgid "Error message"
 msgstr ""

wagtail/contrib/styleguide/locale/he_IL/LC_MESSAGES/django.po

@@ -16,8 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he_IL\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % "
-"1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
+"Plural-Forms: nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % "
+"1 == 0) ? 1: 2;\n"
 
 msgid "Save"
 msgstr "שמור"

wagtail/contrib/table_block/blocks.py

@@ -130,9 +130,9 @@ class TableBlock(FieldBlock):
         """
         If value came from a table block stored before Wagtail 6.0, we need to set an appropriate
         value for the header choice. I would really like to have this default to "" and force the
-        editor to reaffirm they don't want any headers, but that woud be a breaking change.
+        editor to reaffirm they don't want any headers, but that would be a breaking change.
         """
-        if not value.get("table_header_choice", ""):
+        if value and not value.get("table_header_choice", ""):
             if value.get("first_row_is_table_header", False) and value.get(
                 "first_col_is_header", False
             ):