Merge pull request #17 from cz31/main

Fix bugs

Author: nim65s

wagtail_form_plugins/plugins/conditional_fields/blocks.py

@@ -63,6 +63,7 @@ class RuleBlock(blocks.StructBlock):
             ("c", _("is checked")),
             ("nc", _("is not checked")),
         ],
+        required=False,
         form_classname="formbuilder-beb-operator",
     )
     value_char = blocks.CharBlock(

wagtail_form_plugins/plugins/conditional_fields/form_field.py

@@ -43,7 +43,7 @@ def format_rule(cls, rule: RuleBlockValueDict) -> FormattedRuleDict:
 
         if rule["value_char"]:
             fmt_value = rule["value_char"]
-        if rule["value_date"]:
+        elif rule["value_date"]:
             fmt_value = date_to_timestamp(rule["value_date"])
         elif rule["value_time"]:
             fmt_value = time_to_timestamp(rule["value_time"])

wagtail_form_plugins/plugins/templating/models.py

@@ -44,6 +44,8 @@ def format_submission(
     def get_form(self, *args, page: StreamFieldFormPage, user: User, **kwargs) -> BaseForm:
         """Get the generated form."""
         form = super().get_form(*args, page=page, user=user, **kwargs)
+        if page.first_published_at is None:
+            return form
 
         formatter = self.templating_formatter_class(form_page=page, user=user)
         for field_slug, field in form.fields.items():