From 5c6f15811858bd752c0891cd13c575334ef8b46e Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 28 Feb 2025 11:59:32 +0100 Subject: 🚑️ forms: fix management of json fields with formsets, limited permissions and custom forms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ishtar_common/forms.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'ishtar_common/forms.py') diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py index b88241b9b..2f311a779 100644 --- a/ishtar_common/forms.py +++ b/ishtar_common/forms.py @@ -339,9 +339,12 @@ class CustomForm(BSForm): :return: ((order1, key1, field1), ...) """ fields = [] - if not hasattr(cls, "base_fields"): - return - is_search = "search_vector" in cls.base_fields + if hasattr(cls, "base_fields"): + base_fields = cls.base_fields + else: + # formset + base_fields = cls.form.base_fields + is_search = "search_vector" in base_fields q = custom_form.json_fields.values( "label", "help_text", -- cgit v1.2.3