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

wagtail/blocks/static_block.py

@@ -30,6 +30,9 @@ class StaticBlock(Block):
     def value_from_datadict(self, data, files, prefix):
         return None
 
+    def normalize(self, value):
+        return None
+
     class Meta:
         admin_text = None
         default = None

wagtail/blocks/stream_block.py

@@ -1,4 +1,5 @@
 import itertools
+import json
 import uuid
 from collections import OrderedDict, defaultdict
 from collections.abc import Mapping, MutableSequence
@@ -88,16 +89,8 @@ class BaseStreamBlock(Block):
                 block.set_name(name)
                 self.child_blocks[name] = block
 
-    def get_default(self):
-        """
-        Default values set on a StreamBlock should be a list of (type_name, value) tuples -
-        we can't use StreamValue directly, because that would require a reference back to
-        the StreamBlock that hasn't been built yet.
-
-        For consistency, then, we need to convert it to a StreamValue here for StreamBlock
-        to work with.
-        """
-        return StreamValue(self, self.meta.default)
+    def empty_value(self, raw_text=None):
+        return StreamValue(self, [], raw_text=raw_text)
 
     def sorted_child_blocks(self):
         """Child blocks, sorted in to their groups."""
@@ -230,19 +223,58 @@ class BaseStreamBlock(Block):
         return StreamValue(self, cleaned_data)
 
     def to_python(self, value):
-        # the incoming JSONish representation is a list of dicts, each with a 'type' and 'value' field
-        # (and possibly an 'id' too).
-        # This is passed to StreamValue to be expanded lazily - but first we reject any unrecognised
-        # block types from the list
-        return StreamValue(
-            self,
-            [
-                child_data
-                for child_data in value
-                if child_data["type"] in self.child_blocks
-            ],
-            is_lazy=True,
-        )
+        if isinstance(value, StreamValue):
+            return value
+        elif isinstance(value, str) and value:
+            try:
+                value = json.loads(value)
+            except ValueError:
+                # value is not valid JSON; most likely, this field was previously a
+                # rich text field before being migrated to StreamField, and the data
+                # was left intact in the migration. Return an empty stream instead
+                # (but keep the raw text available as an attribute, so that it can be
+                # used to migrate that data to StreamField)
+                return self.empty_value(raw_text=value)
+
+        if not value:
+            return self.empty_value()
+
+        # ensure value is a list and not some other kind of iterable
+        value = list(value)
+
+        if isinstance(value[0], dict):
+            # value is in JSONish representation - a dict with 'type' and 'value' keys.
+            # This is passed to StreamValue to be expanded lazily - but first we reject any unrecognised
+            # block types from the list
+            return StreamValue(
+                self,
+                [
+                    child_data
+                    for child_data in value
+                    if child_data["type"] in self.child_blocks
+                ],
+                is_lazy=True,
+            )
+        else:
+            # See if it looks like the standard non-smart representation of a
+            # StreamField value: a list of (block_name, value) tuples
+            try:
+                [None for (x, y) in value]
+            except (TypeError, ValueError) as exc:
+                # Give up trying to make sense of the value
+                raise TypeError(
+                    f"Cannot handle {value!r} (type {type(value)!r}) as a value of a StreamBlock"
+                ) from exc
+
+            # Test succeeded, so return as a StreamValue-ified version of that value
+            return StreamValue(
+                self,
+                [
+                    (k, self.child_blocks[k].normalize(v))
+                    for k, v in value
+                    if k in self.child_blocks
+                ],
+            )
 
     def bulk_to_python(self, values):
         # 'values' is a list of streams, each stream being a list of dicts with 'type', 'value' and
@@ -304,6 +336,9 @@ class BaseStreamBlock(Block):
             # round-trips to the full data representation and back)
             return value.get_prep_value()
 
+    def normalize(self, value):
+        return self.to_python(value)
+
     def get_form_state(self, value):
         if not value:
             return []

wagtail/blocks/struct_block.py

@@ -125,16 +125,14 @@ class BaseStructBlock(Block):
         rather than a StructValue; for consistency, we need to convert it to a StructValue
         for StructBlock to work with
         """
-        return self._to_struct_value(
-            [
-                (
-                    name,
-                    self.meta.default[name]
-                    if name in self.meta.default
-                    else block.get_default(),
-                )
+
+        return self.normalize(
+            {
+                name: self.meta.default[name]
+                if name in self.meta.default
+                else block.get_default()
                 for name, block in self.child_blocks.items()
-            ]
+            }
         )
 
     def value_from_datadict(self, data, files, prefix):
@@ -238,6 +236,14 @@ class BaseStructBlock(Block):
             for name, val in value.items()
         }
 
+    def normalize(self, value):
+        if isinstance(value, self.meta.value_class):
+            return value
+
+        return self._to_struct_value(
+            {k: self.child_blocks[k].normalize(v) for k, v in value.items()}
+        )
+
     def get_form_state(self, value):
         return {
             name: self.child_blocks[name].get_form_state(val)

wagtail/contrib/forms/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"
@@ -37,118 +37,118 @@ msgid ""
 "them."
 msgstr ""
 
-#: models.py:21
+#: models.py:20
 msgid "Single line text"
 msgstr ""
 
-#: models.py:22
+#: models.py:21
 msgid "Multi-line text"
 msgstr ""
 
-#: models.py:23
+#: models.py:22
 msgid "Email"
 msgstr ""
 
-#: models.py:24
+#: models.py:23
 msgid "Number"
 msgstr ""
 
-#: models.py:25
+#: models.py:24
 msgid "URL"
 msgstr ""
 
-#: models.py:26
+#: models.py:25
 msgid "Checkbox"
 msgstr ""
 
-#: models.py:27
+#: models.py:26
 msgid "Checkboxes"
 msgstr ""
 
-#: models.py:28
+#: models.py:27
 msgid "Drop down"
 msgstr ""
 
-#: models.py:29
+#: models.py:28
 msgid "Multiple select"
 msgstr ""
 
-#: models.py:30
+#: models.py:29
 msgid "Radio buttons"
 msgstr ""
 
-#: models.py:31
+#: models.py:30
 msgid "Date"
 msgstr ""
 
-#: models.py:32
+#: models.py:31
 msgid "Date/time"
 msgstr ""
 
-#: models.py:33
+#: models.py:32
 msgid "Hidden field"
 msgstr ""
 
-#: models.py:48
+#: models.py:47
 msgid "submit time"
 msgstr ""
 
-#: models.py:67
+#: models.py:66
 msgid "form submission"
 msgstr ""
 
-#: models.py:68
+#: models.py:67
 msgid "form submissions"
 msgstr ""
 
-#: models.py:81
+#: models.py:80
 msgid "name"
 msgstr ""
 
-#: models.py:86
+#: models.py:85
 msgid "Safe name of the form field, the label converted to ascii_snake_case"
 msgstr ""
 
-#: models.py:90
+#: models.py:89
 msgid "label"
 msgstr ""
 
-#: models.py:92
+#: models.py:91
 msgid "The label of the form field"
 msgstr ""
 
-#: models.py:95
+#: models.py:94
 msgid "field type"
 msgstr ""
 
-#: models.py:97
+#: models.py:96
 msgid "required"
 msgstr ""
 
-#: models.py:99
+#: models.py:98
 msgid "choices"
 msgstr ""
 
-#: models.py:102
+#: models.py:101
 msgid ""
 "Comma or new line separated list of choices. Only applicable in checkboxes, "
 "radio and dropdown."
 msgstr ""
 
-#: models.py:106
+#: models.py:105
 msgid "default value"
 msgstr ""
 
-#: models.py:109
+#: models.py:108
 msgid ""
 "Default value. Comma or new line separated values supported for checkboxes."
 msgstr ""
 
-#: models.py:113
+#: models.py:112
 msgid "help text"
 msgstr ""
 
-#: models.py:196
+#: models.py:195 views.py:149
 msgid "Submission date"
 msgstr ""
 
@@ -202,10 +202,15 @@ msgstr[1] ""
 msgid "Delete"
 msgstr ""
 
-#: templates/wagtailforms/list_submissions.html:10
+#: templates/wagtailforms/list_submissions.html:36
 msgid "Delete selected submissions"
 msgstr ""
 
+#: templates/wagtailforms/list_submissions.html:44
+#, python-format
+msgid "There have been no submissions of the '%(title)s' form."
+msgstr ""
+
 #: templates/wagtailforms/panels/form_responses_panel.html:2
 msgid "Total submissions"
 msgstr ""
@@ -219,28 +224,15 @@ msgstr ""
 msgid "Submissions of %(form_title)s"
 msgstr ""
 
-#: templates/wagtailforms/submissions_index.html:42
-#, python-format
-msgid "There have been no submissions of the '%(title)s' form."
-msgstr ""
-
-#: templates/wagtailforms/submissions_index.html:46
-msgid "Filter"
-msgstr ""
-
-#: templates/wagtailforms/submissions_index.html:54
-msgid "Apply filters"
-msgstr ""
-
-#: views.py:50 wagtail_hooks.py:26
+#: views.py:52 views.py:267 wagtail_hooks.py:26
 msgid "Forms"
 msgstr ""
 
-#: views.py:57
+#: views.py:59
 msgid "Title"
 msgstr ""
 
-#: views.py:64
+#: views.py:66
 msgid "Origin"
 msgstr ""
 
@@ -255,6 +247,6 @@ msgid_plural "%(count)d submissions have been deleted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: views.py:159
+#: views.py:168
 msgid "Form data"
 msgstr ""

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

@@ -17,8 +17,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 "Date from"
 msgstr "מתאריך"

wagtail/contrib/forms/models.py

@@ -1,7 +1,6 @@
 import datetime
 import os
 
-from django.conf import settings
 from django.core.serializers.json import DjangoJSONEncoder
 from django.core.validators import validate_email
 from django.db import models
@@ -264,10 +263,11 @@ class FormMixin:
         """
         Returns list submissions view for admin.
 
-        `list_submissions_view_class` can bse set to provide custom view class.
+        `list_submissions_view_class` can be set to provide custom view class.
         Your class must be inherited from SubmissionsListView.
         """
-        view = self.get_submissions_list_view_class().as_view()
+        results_only = kwargs.pop("results_only", False)
+        view = self.get_submissions_list_view_class().as_view(results_only=results_only)
         return view(request, form_page=self, *args, **kwargs)
 
     def serve(self, request, *args, **kwargs):
@@ -365,9 +365,9 @@ class EmailFormMixin(models.Model):
 
             # Format dates and datetime(s) with SHORT_DATE(TIME)_FORMAT
             if isinstance(value, datetime.datetime):
-                value = date_format(value, settings.SHORT_DATETIME_FORMAT)
+                value = date_format(value, "SHORT_DATETIME_FORMAT")
             elif isinstance(value, datetime.date):
-                value = date_format(value, settings.SHORT_DATE_FORMAT)
+                value = date_format(value, "SHORT_DATE_FORMAT")
 
             content.append(f"{field.label}: {value}")
 

wagtail/contrib/forms/templates/wagtailforms/list_submissions.html

@@ -1,37 +1,48 @@
+{% extends "wagtailadmin/generic/index_results.html" %}
 {% load i18n %}
-<div class="w-overflow-auto">
-    <table class="listing" data-controller="w-bulk" data-w-bulk-action-inactive-class="w-invisible">
-        <col />
-        <col />
-        <col />
-        <thead>
-            <tr>
-                <th colspan="{{ data_headings|length|add:1 }}">
-                    <button class="button no w-invisible" data-w-bulk-target="action">{% trans "Delete selected submissions" %}</button>
-                </th>
-            </tr>
-            <tr>
-                <th><input type="checkbox" data-action="w-bulk#toggleAll" data-w-bulk-target="all" /></th>
-                {% for heading in data_headings %}
-                    <th id="{{ heading.name }}" class="{% if heading.order %}ordered icon {% if heading.order == 'ascending' %}icon-arrow-up-after{% else %}icon-arrow-down-after{% endif %}{% endif %}">
-                        {% if heading.order %}<a href="?order_by={% if heading.order == 'ascending' %}-{% endif %}{{ heading.name }}">{{ heading.label }}</a>{% else %}{{ heading.label }}{% endif %}
-                    </th>
-                {% endfor %}
-            </tr>
-        </thead>
-        <tbody>
-            {% for row in data_rows %}
+{% block results %}
+    <form class="w-overflow-auto" data-controller="w-bulk" data-w-bulk-action-inactive-class="w-invisible" action="{% url 'wagtailforms:delete_submissions' form_page.id %}" method="get">
+        <table class="listing">
+            <col />
+            <col />
+            <col />
+            <thead>
                 <tr>
-                    <td>
-                        <input type="checkbox" name="selected-submissions" class="select-submission" value="{{ row.model_id }}" data-action="w-bulk#toggle" data-w-bulk-target="item" />
-                    </td>
-                    {% for cell in row.fields %}
-                        <td>
-                            {{ cell }}
-                        </td>
+                    <th><input type="checkbox" data-action="w-bulk#toggleAll" data-w-bulk-target="all" /></th>
+                    {% for heading in data_headings %}
+                        <th id="{{ heading.name }}" class="{% if heading.order %}ordered icon {% if heading.order == 'ascending' %}icon-arrow-up-after{% else %}icon-arrow-down-after{% endif %}{% endif %}">
+                            {% if heading.order %}<a href="?order_by={% if heading.order == 'ascending' %}-{% endif %}{{ heading.name }}">{{ heading.label }}</a>{% else %}{{ heading.label }}{% endif %}
+                        </th>
                     {% endfor %}
                 </tr>
-            {% endfor %}
-        </tbody>
-    </table>
-</div>
+            </thead>
+            <tbody>
+                {% for row in data_rows %}
+                    <tr>
+                        <td>
+                            <input type="checkbox" name="selected-submissions" class="select-submission" value="{{ row.model_id }}" data-action="w-bulk#toggle" data-w-bulk-target="item" />
+                        </td>
+                        {% for cell in row.fields %}
+                            <td>
+                                {{ cell }}
+                            </td>
+                        {% endfor %}
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+        <div class="nice-padding">
+            <button class="button no w-invisible" data-w-bulk-target="action">
+                {% trans "Delete selected submissions" %}
+            </button>
+        </div>
+    </form>
+{% endblock %}
+
+{% block no_results_message %}
+    <p>
+        {% blocktrans trimmed with title=form_page.title %}
+            There have been no submissions of the '{{ title }}' form.
+        {% endblocktrans %}
+    </p>
+{% endblock %}

wagtail/contrib/forms/templates/wagtailforms/submissions_index.html

@@ -1,64 +1,3 @@
-{% extends "wagtailadmin/base.html" %}
-{% load i18n wagtailadmin_tags %}
+{% extends "wagtailadmin/generic/listing.html" %}
+{% load i18n %}
 {% block titletag %}{% blocktrans trimmed with form_title=form_page.title|capfirst %}Submissions of {{ form_title }}{% endblocktrans %}{% endblock %}
-{% block extra_js %}
-    {{ block.super }}
-
-    <script>
-        $.fn.datetimepicker.defaults.i18n.wagtail_custom_locale = {
-            months: wagtailConfig.STRINGS.MONTHS,
-            dayOfWeek: wagtailConfig.STRINGS.WEEKDAYS,
-            dayOfWeekShort: wagtailConfig.STRINGS.WEEKDAYS_SHORT,
-        }
-        $.datetimepicker.setLocale('wagtail_custom_locale');
-
-        $(function() {
-            $('#id_date_from').datetimepicker({
-                timepicker: false,
-                format: 'Y-m-d',
-            });
-            $('#id_date_to').datetimepicker({
-                timepicker: false,
-                format: 'Y-m-d',
-            });
-        });
-    </script>
-{% endblock %}
-{% block content %}
-    {% fragment as form_actions %}
-        {% include view.export_buttons_template_name %}
-    {% endfragment %}
-
-    {% include "wagtailadmin/shared/header.html" with classname="w-header--no-border" title=page_title subtitle=form_page.title|capfirst icon="form" merged=1 extra_actions=form_actions %}
-
-    <div class="report filterable">
-        <div class="report__results w-overflow-y-hidden w-overflow-x-scroll w-pb-6">
-            {% if submissions %}
-                <form action="{% url 'wagtailforms:delete_submissions' form_page.id %}" method="get">
-                    {% include "wagtailforms/list_submissions.html" %}
-                    {% include "wagtailadmin/shared/pagination_nav.html" with items=page_obj %}
-                </form>
-            {% else %}
-                <p class="no-results-message">{% blocktrans trimmed with title=form_page.title %}There have been no submissions of the '{{ title }}' form.{% endblocktrans %}</p>
-            {% endif %}
-        </div>
-        <div class="filterable__filters">
-            <h2>{% trans 'Filter' %}</h2>
-            <form action="" method="get" novalidate>
-                <button
-                    class="button button-longrunning"
-                    type="submit"
-                    data-controller="w-progress"
-                    data-action="w-progress#activate"
-                >
-                    {% icon name="spinner" %}{% trans 'Apply filters' %}
-                </button>
-                {% for field in select_date_form %}
-                    <li>
-                        {% formattedfield field %}
-                    </li>
-                {% endfor %}
-            </form>
-        </div>
-    </div>
-{% endblock %}

wagtail/contrib/forms/tests/test_models.py

@@ -770,6 +770,32 @@ class TestCleanedDataEmails(TestCase):
         self.assertEqual(len(mail.outbox), 3)
         self.assertIn("Datetime: 12/21/1910 9:19 p.m.", mail.outbox[2].body)
 
+    @override_settings(USE_I18N=True, LANGUAGE_CODE="de")
+    def test_date_localization(self):
+        self.client.post(
+            "/contact-us/",
+            {
+                "date": "2017-12-31",
+            },
+        )
+
+        # Check the email
+        self.assertEqual(len(mail.outbox), 1)
+        self.assertIn("Date: 31.12.2017", mail.outbox[0].body)
+
+    @override_settings(USE_I18N=True, LANGUAGE_CODE="de")
+    def test_datetime_localization(self):
+        self.client.post(
+            "/contact-us/",
+            {
+                "datetime": "1910-12-21 21:19:12",
+            },
+        )
+
+        # Check the email
+        self.assertEqual(len(mail.outbox), 1)
+        self.assertIn("Datetime: 21.12.1910 21:19", mail.outbox[0].body)
+
 
 class TestIssue798(WagtailTestUtils, TestCase):
     fixtures = ["test.json"]

wagtail/contrib/forms/urls.py

@@ -15,6 +15,12 @@ urlpatterns = [
     path(
         "submissions/<int:page_id>/", get_submissions_list_view, name="list_submissions"
     ),
+    path(
+        "submissions/<int:page_id>/results/",
+        get_submissions_list_view,
+        {"results_only": True},
+        name="list_submissions_results",
+    ),
     path(
         "submissions/<int:page_id>/delete/",
         DeleteSubmissionsView.as_view(),