PyPI - wagtail - Versions diffs - 7.0.2__py3-none-any.whl → 7.1rc1__py3-none-any.whl - Mend

wagtail 7.0.2py3-none-any.whl → 7.1rc1py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1292) hide show

wagtail/contrib/search_promotions/locale/lt/LC_MESSAGES/django.po CHANGED Viewed

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: Matas Dailyda <matas@dailyda.com>, 2017\n"
 "Language-Team: Lithuanian (http://app.transifex.com/torchbox/wagtail/"

wagtail/contrib/search_promotions/locale/lv/LC_MESSAGES/django.po CHANGED Viewed

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: Reinis Rozenbergs <reinisr@gmail.com>, 2016\n"
 "Language-Team: Latvian (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/contrib/search_promotions/locale/mi/LC_MESSAGES/django.po CHANGED Viewed

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: Awatea Randall <awatea@octave.nz>, 2021\n"
 "Language-Team: Maori (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/contrib/search_promotions/locale/mn/LC_MESSAGES/django.po CHANGED Viewed

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: Myagmarjav Enkhbileg <miigaa.lucky@gmail.com>, 2019\n"
 "Language-Team: Mongolian (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/contrib/search_promotions/locale/my/LC_MESSAGES/django.po CHANGED Viewed

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Burmese (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/contrib/search_promotions/locale/nb/LC_MESSAGES/django.po CHANGED Viewed

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: Eirik Krogstad <eirikkr@gmail.com>, 2015\n"
 "Language-Team: Norwegian Bokmål (http://app.transifex.com/torchbox/wagtail/"

wagtail/contrib/search_promotions/locale/nl/LC_MESSAGES/django.po CHANGED Viewed

@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: Storm Heg <storm@stormbase.digital>, 2022-2025\n"
 "Language-Team: Dutch (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/contrib/search_promotions/locale/pl/LC_MESSAGES/django.po CHANGED Viewed

@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: Krzysztof Jeziorny <github@jeziorny.net>, 2023\n"
 "Language-Team: Polish (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/contrib/search_promotions/locale/pt_BR/LC_MESSAGES/django.po CHANGED Viewed

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: Luiz Boaretto <lboaretto@gmail.com>, 2016,2018,2021,2024\n"
 "Language-Team: Portuguese (Brazil) (http://app.transifex.com/torchbox/"

wagtail/contrib/search_promotions/locale/pt_PT/LC_MESSAGES/django.po CHANGED Viewed

@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: 425fe09b3064b9f906f637fff94056ae_a00ea56 "
 "<0fa3588fa89906bfcb3a354600956e0e_308047>, 2015\n"

wagtail/contrib/search_promotions/locale/ro/LC_MESSAGES/django.po CHANGED Viewed

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: Dan Braghis, 2016,2019-2020,2022,2024\n"
 "Language-Team: Romanian (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/contrib/search_promotions/locale/ru/LC_MESSAGES/django.po CHANGED Viewed

@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: Andrei Satsevich, 2023-2025\n"
 "Language-Team: Russian (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/contrib/search_promotions/locale/sk_SK/LC_MESSAGES/django.po CHANGED Viewed

@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: dellax <michalnebbia@gmail.com>, 2015\n"
 "Language-Team: Slovak (Slovakia) (http://app.transifex.com/torchbox/wagtail/"

wagtail/contrib/search_promotions/locale/sl/LC_MESSAGES/django.po CHANGED Viewed

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: Andrej Marsetič, 2022-2024\n"
 "Language-Team: Slovenian (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/contrib/search_promotions/locale/sv/LC_MESSAGES/django.po CHANGED Viewed

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: Martin Sandström <martin@marteinn.se>, 2020,2024\n"
 "Language-Team: Swedish (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/contrib/search_promotions/locale/tet/LC_MESSAGES/django.po CHANGED Viewed

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: Matt Westcott <matthew@torchbox.com>, 2021\n"
 "Language-Team: Tetum (Tetun) (http://app.transifex.com/torchbox/wagtail/"

wagtail/contrib/search_promotions/locale/th/LC_MESSAGES/django.po CHANGED Viewed

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: Walaksawan Vervoort <nula_wala@yahoo.com>, 2019\n"
 "Language-Team: Thai (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/contrib/search_promotions/locale/tr/LC_MESSAGES/django.po CHANGED Viewed

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: Ragıp Ünal <ragip@ragipunal.com>, 2016\n"
 "Language-Team: Turkish (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/contrib/search_promotions/locale/tr_TR/LC_MESSAGES/django.po CHANGED Viewed

@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: José Luis <alagunajs@gmail.com>, 2015-2016\n"
 "Language-Team: Turkish (Turkey) (http://app.transifex.com/torchbox/wagtail/"

wagtail/contrib/search_promotions/locale/ug/LC_MESSAGES/django.po CHANGED Viewed

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: Abduqadir Abliz <sahranbay@gmail.com>, 2024\n"
 "Language-Team: Uyghur (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/contrib/search_promotions/locale/uk/LC_MESSAGES/django.po CHANGED Viewed

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: d55ee35323c0c760f088259cd23b1b6d_9e8a7d1 "
 "<5459f3ae99ecdd5ed0be0220acd46004_1019581>, 2021\n"

wagtail/contrib/search_promotions/locale/vi/LC_MESSAGES/django.po CHANGED Viewed

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese (http://app.transifex.com/torchbox/wagtail/"

wagtail/contrib/search_promotions/locale/zh/LC_MESSAGES/django.po CHANGED Viewed

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/contrib/search_promotions/locale/zh_Hans/LC_MESSAGES/django.po CHANGED Viewed

@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: Ford Guo <agile.guo@gmail.com>, 2023\n"
 "Language-Team: Chinese (China) (http://app.transifex.com/torchbox/wagtail/"

wagtail/contrib/search_promotions/locale/zh_Hant/LC_MESSAGES/django.po CHANGED Viewed

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-24 13:02+0100\n"
+"POT-Creation-Date: 2025-04-25 23:08+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese Traditional (http://app.transifex.com/torchbox/"

wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/includes/searchpromotion_form.html CHANGED Viewed

@@ -2,7 +2,7 @@
 {% fragment as id %}inline_child_{{ form.prefix }}{% endfragment %}
 {% fragment as panel_id %}{{ id }}-panel{% endfragment %}
-<div id="{{ id }}"{% if form.DELETE.value %} style="display: none;"{% endif %}>
+<div id="{{ id }}"{% if form.DELETE.value %} hidden {% endif %}>
     {% fragment as header_controls %}
         <button type="button" class="button button--icon text-replace" data-inline-panel-child-move-up>{% icon name="arrow-up" %}{% trans "Move up" %}</button>

wagtail/contrib/search_promotions/tests.py CHANGED Viewed

@@ -4,6 +4,7 @@ from io import BytesIO, StringIO
 from django.contrib.auth.models import Permission
 from django.core import management
+from django.db.models import F
 from django.test import TestCase
 from django.urls import reverse
 from django.utils import timezone
@@ -24,6 +25,18 @@ from wagtail.test.utils import WagtailTestUtils
 from wagtail.test.utils.template_tests import AdminTemplateTestUtils
+def _add_N_hits(query, n, date=None):
+    """
+    Add multiple daily hits to the given query
+    """
+    if n < 2:
+        raise ValueError("You must add at least 2 hits")
+    if date is None:
+        date = timezone.now().date()
+    query.add_hit(date=date)  # Make sure the associated QueryDailyHits is created
+    QueryDailyHits.objects.filter(query=query, date=date).update(hits=F("hits") + n - 1)
 class TestSearchPromotions(TestCase):
     def test_search_pick_create(self):
         # Create a search pick to the root page
@@ -87,8 +100,7 @@ class TestSearchPromotions(TestCase):
     def test_get_most_popular(self):
         popularQuery = Query.get("popular")
-        for i in range(5):
-            popularQuery.add_hit()
+        _add_N_hits(popularQuery, 5)
         SearchPromotion.objects.create(
             query=Query.get("popular"),
             page_id=2,
@@ -117,8 +129,7 @@ class TestSearchPromotions(TestCase):
         FIVE_DAYS_AGO = TODAY - timedelta(days=5)
         popularQuery = Query.get("popular")
-        for i in range(5):
-            popularQuery.add_hit(date=FIVE_DAYS_AGO)
+        _add_N_hits(popularQuery, 5, date=FIVE_DAYS_AGO)
         surpriseQuery = Query.get("surprise")
         surpriseQuery.add_hit(date=TODAY)
@@ -382,8 +393,7 @@ class TestSearchPromotionsIndexView(AdminTemplateTestUtils, WagtailTestUtils, Te
         )
         popularQuery = Query.get("optimal")
-        for i in range(50):
-            popularQuery.add_hit()
+        _add_N_hits(popularQuery, 50)
         SearchPromotion.objects.create(
             query=popularQuery,
             page_id=1,
@@ -392,8 +402,7 @@ class TestSearchPromotionsIndexView(AdminTemplateTestUtils, WagtailTestUtils, Te
         )
         popularQuery = Query.get("suboptimal")
-        for i in range(25):
-            popularQuery.add_hit()
+        _add_N_hits(popularQuery, 25)
         SearchPromotion.objects.create(
             query=popularQuery,
             page_id=1,
@@ -1569,13 +1578,8 @@ class TestQueryStringNormalisation(TestCase):
 class TestQueryPopularity(TestCase):
     def test_query_popularity(self):
-        # Add 3 hits to unpopular query
-        for i in range(3):
-            Query.get("unpopular query").add_hit()
-        # Add 10 hits to popular query
-        for i in range(10):
-            Query.get("popular query").add_hit()
+        _add_N_hits(Query.get("unpopular query"), 3)
+        _add_N_hits(Query.get("popular query"), 10)
         # Get most popular queries
         popular_queries = Query.get_most_popular()
@@ -1585,9 +1589,7 @@ class TestQueryPopularity(TestCase):
         self.assertEqual(popular_queries[0], Query.get("popular query"))
         self.assertEqual(popular_queries[1], Query.get("unpopular query"))
-        # Add 5 hits to little popular query
-        for i in range(5):
-            Query.get("little popular query").add_hit()
+        _add_N_hits(Query.get("little popular query"), 5)
         # Check list again, little popular query should be in the middle
         self.assertEqual(popular_queries.count(), 3)
@@ -1596,8 +1598,7 @@ class TestQueryPopularity(TestCase):
         self.assertEqual(popular_queries[2], Query.get("unpopular query"))
         # Unpopular query goes viral!
-        for i in range(20):
-            Query.get("unpopular query").add_hit()
+        _add_N_hits(Query.get("unpopular query"), 20)
         # Unpopular query should be most popular now
         self.assertEqual(popular_queries.count(), 3)
@@ -1612,14 +1613,11 @@ class TestQueryHitsReportView(BaseReportViewTestCase):
     @classmethod
     def setUpTestData(self):
         self.query = Query.get("A query with three hits")
-        self.query.add_hit()
-        self.query.add_hit()
-        self.query.add_hit()
+        _add_N_hits(self.query, 3)
         Query.get("a query with no hits")
         Query.get("A query with one hit").add_hit()
         query = Query.get("A query with two hits")
-        query.add_hit()
-        query.add_hit()
+        _add_N_hits(query, 2)
     def test_simple(self):
         response = self.get()
@@ -1730,6 +1728,22 @@ class TestQueryHitsReportView(BaseReportViewTestCase):
                     results,
                 )
+    def test_hits_column_localized(self):
+        _add_N_hits(self.query, 10_000)
+        def _get_hits(lang):
+            response = self.get(headers={"accept-language": lang})
+            soup = self.get_soup(response.content)
+            trs = soup.select("main tr")
+            self.assertEqual(len(trs), 4)  # 1 header + 3 body rows
+            _, hits = trs[1].select("td")
+            return hits.text.strip()
+        for lang, expected in [("en", "10,003"), ("fr", "10\N{NO-BREAK SPACE}003")]:
+            with self.subTest(lang=lang):
+                hits = _get_hits(lang=lang)
+                self.assertEqual(hits, expected)
 class TestFilteredQueryHitsView(BaseReportViewTestCase):
     url_name = "wagtailsearchpromotions:search_terms"

wagtail/contrib/search_promotions/views/reports.py CHANGED Viewed

@@ -3,7 +3,7 @@ from django_filters import DateFromToRangeFilter
 from wagtail.admin.auth import permission_denied
 from wagtail.admin.filters import DateRangePickerWidget, WagtailFilterSet
-from wagtail.admin.ui.tables import Column
+from wagtail.admin.ui.tables import Column, NumberColumn
 from wagtail.admin.views.reports import ReportView
 from wagtail.contrib.search_promotions.models import Query
@@ -31,7 +31,7 @@ class SearchTermsReportView(ReportView):
     index_results_url_name = "wagtailsearchpromotions:search_terms_results"
     columns = [
         Column("query_string", label=_("Search term(s)"), sort_key="query_string"),
-        Column("_hits", label=_("Views"), sort_key="_hits"),
+        NumberColumn("_hits", label=_("Views"), sort_key="_hits"),
     ]
     export_headings = {
         "query_string": _("Search term(s)"),

wagtail/contrib/search_promotions/views/settings.py CHANGED Viewed

@@ -10,7 +10,11 @@ from django.utils.translation import gettext_lazy
 from wagtail.admin import messages
 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.ui.tables import (
+    NumberColumn,
+    RelatedObjectsColumn,
+    TitleColumn,
+)
 from wagtail.admin.views import generic
 from wagtail.contrib.search_promotions import forms, models
 from wagtail.contrib.search_promotions.models import Query, SearchPromotion
@@ -51,7 +55,7 @@ class IndexView(generic.IndexView):
             label=gettext_lazy("Promoted results"),
             width="40%",
         ),
-        Column(
+        NumberColumn(
             "views",
             label=gettext_lazy("Views"),
             width="20%",

wagtail/contrib/settings/forms.py CHANGED Viewed

@@ -1,8 +1,14 @@
 from django import forms
+from django.contrib.auth import get_permission_codename
+from django.contrib.auth.models import Permission
+from django.contrib.contenttypes.models import ContentType
+from django.template.loader import render_to_string
 from django.urls import reverse
+from django.utils.text import capfirst
+from django.utils.translation import gettext
 from django.utils.translation import gettext_lazy as _
-from wagtail.models import Site
+from wagtail.models import GroupSitePermission, Site
 class SiteSwitchForm(forms.Form):
@@ -16,7 +22,7 @@ class SiteSwitchForm(forms.Form):
         ),
     )
-    def __init__(self, current_site, model, **kwargs):
+    def __init__(self, current_site, model, sites, **kwargs):
         initial_data = {"site": self.get_change_url(current_site, model)}
         super().__init__(initial=initial_data, **kwargs)
         self.fields["site"].choices = [
@@ -28,7 +34,7 @@ class SiteSwitchForm(forms.Form):
                     else site.hostname
                 ),
             )
-            for site in Site.objects.all()
+            for site in sites
         ]
     @classmethod
@@ -37,3 +43,87 @@ class SiteSwitchForm(forms.Form):
             "wagtailsettings:edit",
             args=[model._meta.app_label, model._meta.model_name, site.pk],
         )
+class SitePermissionForm(forms.Form):
+    """
+    A form to be displayed as a panel on the group edit page, to select which sites a group
+    can edit settings for. Should be subclassed to provide a `settings_model` attribute that
+    specifies the model that the permissions apply to.
+    """
+    template_name = "wagtailsettings/permissions/includes/site_permission_form.html"
+    sites = forms.ModelMultipleChoiceField(
+        queryset=Site.objects.all(),
+        required=False,
+        widget=forms.CheckboxSelectMultiple,
+        label=_("Sites"),
+    )
+    def __init__(self, *args, instance, **kwargs):
+        if not kwargs.get("prefix"):
+            kwargs["prefix"] = (
+                f"{self.settings_model._meta.app_label}_{self.settings_model._meta.model_name}_site_permissions"
+            )
+        content_type = ContentType.objects.get_for_model(self.settings_model)
+        permission_codename = get_permission_codename(
+            "change", self.settings_model._meta
+        )
+        self.permission = Permission.objects.get(
+            content_type=content_type, codename=permission_codename
+        )
+        self.instance = instance
+        if instance and instance.pk is not None:
+            # If the instance already exists, prepopulate the sites field with the sites
+            # that the group has permission for.
+            kwargs["initial"] = {
+                "sites": [
+                    permission.site
+                    for permission in self.get_existing_permissions().select_related(
+                        "site"
+                    )
+                ]
+            }
+        super().__init__(*args, **kwargs)
+    def get_existing_permissions(self):
+        return GroupSitePermission.objects.filter(
+            group=self.instance, permission=self.permission
+        )
+    def as_admin_panel(self):
+        return render_to_string(
+            self.template_name,
+            {
+                "heading": capfirst(
+                    gettext("%(model)s permissions")
+                    % {"model": self.settings_model._meta.verbose_name}
+                ),
+                "form": self,
+                "panel_id": f"{self.settings_model._meta.label_lower.replace('.', '-')}-permissions",
+            },
+        )
+    def save(self):
+        existing_site_ids = set(
+            self.get_existing_permissions().values_list("site_id", flat=True)
+        )
+        new_site_ids = set(self.cleaned_data["sites"].values_list("id", flat=True))
+        # Determine which sites to add and which to remove
+        sites_to_add = new_site_ids - existing_site_ids
+        sites_to_remove = existing_site_ids - new_site_ids
+        # Add new sites
+        for site_id in sites_to_add:
+            GroupSitePermission.objects.get_or_create(
+                group=self.instance, site_id=site_id, permission=self.permission
+            )
+        # Remove old sites
+        GroupSitePermission.objects.filter(
+            group=self.instance, site_id__in=sites_to_remove, permission=self.permission
+        ).delete()

wagtail/contrib/settings/locale/ar/LC_MESSAGES/django.mo CHANGED Viewed

Binary file

wagtail/contrib/settings/locale/ar/LC_MESSAGES/django.po CHANGED Viewed

@@ -9,6 +9,7 @@
 # Bashar Al-Abdulhadi, 2020
 # Khaled Arnaout <khaledarnaout@live.com>, 2018
 # Tarek Berkane, 2025
+# Tarek Berkane, 2025
 # Younes Oumakhou, 2022
 # Younes Oumakhou, 2022
 # abdulaziz alfuhigi <abajall@gmail.com>, 2016
@@ -16,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-20 17:59+0000\n"
+"POT-Creation-Date: 2025-04-25 23:09+0100\n"
 "PO-Revision-Date: 2016-03-01 19:20+0000\n"
-"Last-Translator: Tarek Berkane, 2025\n"
+"Last-Translator: abdulaziz alfuhigi <abajall@gmail.com>, 2016\n"
 "Language-Team: Arabic (http://app.transifex.com/torchbox/wagtail/language/"
 "ar/)\n"
 "MIME-Version: 1.0\n"

wagtail/contrib/settings/locale/az_AZ/LC_MESSAGES/django.po CHANGED Viewed

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-20 17:59+0000\n"
+"POT-Creation-Date: 2025-04-25 23:09+0100\n"
 "PO-Revision-Date: 2016-03-01 19:20+0000\n"
 "Last-Translator: Mirza Iskandarov <mirza.iskandarov@gmail.com>, 2020\n"
 "Language-Team: Azerbaijani (Azerbaijan) (http://app.transifex.com/torchbox/"

wagtail/contrib/settings/locale/be/LC_MESSAGES/django.mo CHANGED Viewed

Binary file

wagtail/contrib/settings/locale/be/LC_MESSAGES/django.po CHANGED Viewed

@@ -4,14 +4,15 @@
 #
 # Translators:
 # Andrei Satsevich, 2023
+# Andrei Satsevich, 2023
 # Tatsiana Tsygan <art.tatsiana@gmail.com>, 2018,2020
 msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-20 17:59+0000\n"
+"POT-Creation-Date: 2025-04-25 23:09+0100\n"
 "PO-Revision-Date: 2016-03-01 19:20+0000\n"
-"Last-Translator: Andrei Satsevich, 2023\n"
+"Last-Translator: Tatsiana Tsygan <art.tatsiana@gmail.com>, 2018,2020\n"
 "Language-Team: Belarusian (http://app.transifex.com/torchbox/wagtail/"
 "language/be/)\n"
 "MIME-Version: 1.0\n"

wagtail/contrib/settings/locale/bn/LC_MESSAGES/django.po CHANGED Viewed

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-20 17:59+0000\n"
+"POT-Creation-Date: 2025-04-25 23:09+0100\n"
 "PO-Revision-Date: 2016-03-01 19:20+0000\n"
 "Last-Translator: MA Rahman <ugikot@gmail.com>, 2020\n"
 "Language-Team: Bengali (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/contrib/settings/locale/ca/LC_MESSAGES/django.mo CHANGED Viewed

Binary file

wagtail 7.0.2__py3-none-any.whl → 7.1rc1__py3-none-any.whl

wagtail 7.0.2py3-none-any.whl → 7.1rc1py3-none-any.whl