From d7e0e3a2ee71dd825ae6efeac7a6e63b54c3de85 Mon Sep 17 00:00:00 2001 From: vsakkasld Date: Fri, 5 Sep 2025 13:28:08 +0200 Subject: [PATCH 1/2] Fix form chooser --- pyproject.toml | 2 +- wagtailstreamforms/wagtail_hooks.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 9e0786c..514fba1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ exclude = ["tests*", "docs*"] [project] name = "wagtailstreamforms" -version = "5.2.1" +version = "5.2.2" description = "" authors = [{ name = "Lab Digital BV", email = "info@labdigital.nl" }] dependencies = [ diff --git a/wagtailstreamforms/wagtail_hooks.py b/wagtailstreamforms/wagtail_hooks.py index 979556a..3f4624e 100644 --- a/wagtailstreamforms/wagtail_hooks.py +++ b/wagtailstreamforms/wagtail_hooks.py @@ -5,9 +5,9 @@ from django.urls import include, path, reverse from django.utils.translation import gettext_lazy as _ from generic_chooser.views import ModelChooserViewSet +from generic_chooser.widgets import AdminChooser from wagtail import hooks from wagtail.admin import messages as wagtail_messages -from wagtail.admin.widgets import AdminPageChooser from wagtail_modeladmin.helpers import AdminURLHelper, ButtonHelper from wagtail_modeladmin.options import ModelAdmin, modeladmin_register from wagtail_modeladmin.views import ( @@ -239,7 +239,7 @@ class WagtailStreamFormsChooserViewSet(ModelChooserViewSet): per_page = 10 -class WagtailStreamFormsChooser(AdminPageChooser): +class WagtailStreamFormsChooser(AdminChooser): choose_one_text = _("Choose a form") choose_another_text = _("Choose another form") link_to_chosen_text = _("Edit this form") From cdeb51dd85315209e286043ae64a0bcfaad23272 Mon Sep 17 00:00:00 2001 From: vsakkasld Date: Fri, 5 Sep 2025 13:28:52 +0200 Subject: [PATCH 2/2] Revert invalid fix --- wagtailstreamforms/blocks.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/wagtailstreamforms/blocks.py b/wagtailstreamforms/blocks.py index 9ab5a2b..a9ae59a 100644 --- a/wagtailstreamforms/blocks.py +++ b/wagtailstreamforms/blocks.py @@ -27,11 +27,7 @@ def widget(self): return WagtailStreamFormsChooser() def get_form_state(self, value: dict): - try: - prep_value = self.get_prep_value(value) - return self.widget.get_value_data(prep_value) - except Exception: - return self.widget.get_value_data(value) + return self.widget.get_value_data(value) class WagtailFormBlock(blocks.StructBlock):