diff options
| -rw-r--r-- | ishtar_common/forms.py | 2 | ||||
| -rw-r--r-- | ishtar_common/wizards.py | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py index 6531ad6bb..b29c49c64 100644 --- a/ishtar_common/forms.py +++ b/ishtar_common/forms.py @@ -330,6 +330,8 @@ class CustomForm(BSForm): :return: ((order1, key1, field1), ...) """ fields = [] + if not hasattr(cls, "base_fields"): + return is_search = "search_vector" in cls.base_fields q = custom_form.json_fields.values( "label", diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py index 0d23bdcb4..e5da4c8f6 100644 --- a/ishtar_common/wizards.py +++ b/ishtar_common/wizards.py @@ -64,7 +64,9 @@ def filter_no_fields_form(form, other_check=None): enabled, __, excluded, json_fields = form.check_custom_form( self.request.user.ishtaruser ) - if not hasattr(self, "json_fields"): + if not json_fields: + json_fields = [] + if not hasattr(self, "json_fields") or not self.json_fields: self.json_fields = {} self.json_fields[form.form_slug] = [ key for order, key, field in json_fields |