Merge branch 'main' into updated

Author: fsbraun

.github/workflows/codecov.yml

@@ -20,7 +20,7 @@ jobs:
             dj51_cms41.txt,
         ]
         os: [
-            ubuntu-20.04,
+            ubuntu-latest,
         ]
         exclude:
           - python-version: 3.9

CHANGELOG.rst

@@ -2,6 +2,23 @@
 Changelog
 =========
 
+0.3.2 (2025-03-04)
+==================
+
+* fix: Action tab failed form validation if djangocms-link was installed
+
+0.3.1 (2025-03-03)
+==================
+
+* fix: Send mail action failed  by @fsbraun in https://github.com/django-cms/djangocms-form-builder/pull/21
+* fix: Correct send_mail recipients parameter in action.py by @fdik in https://github.com/django-cms/djangocms-form-builder/pull/22
+* docs: Update Codecov link in  README.rst by @fsbraun in https://github.com/django-cms/djangocms-form-builder/pull/23
+* fix: prevent duplicate submit buttons in forms by @earthcomfy in https://github.com/django-cms/djangocms-form-builder/pull/27
+
+* @fdik made their first contribution in https://github.com/django-cms/djangocms-form-builder/pull/22
+* @earthcomfy made their first contribution in https://github.com/django-cms/djangocms-form-builder/pull/27
+
+
 0.3.0 (2025-01-07)
 ==================
 

djangocms_form_builder/__init__.py

@@ -6,7 +6,7 @@
     _ = lambda x: x  # noqa: E731
 
 
-__version__ = "0.3.0"
+__version__ = "0.3.2"
 
 _form_registry = {}
 

djangocms_form_builder/actions.py

@@ -56,16 +56,16 @@ def get_action_class(action):
     return _action_registry.get(action, None)
 
 
+def get_hash(action_class):
+    return hashlib.sha1(action_class.__name__.encode("utf-8")).hexdigest()
+
+
 class ActionMixin:
     """Adds action form elements to Form plugin admin"""
 
     def get_form(self, request, *args, **kwargs):
         """Creates new form class based adding the actions as mixins"""
-        return type(
-            "FormActionAdminForm",
-            (self.form, *_action_registry.values()),
-            {}
-        )
+        return type("FormActionAdminForm", (self.form, *_action_registry.values()), {})
 
     def get_fieldsets(self, request, obj=None):
         fieldsets = super().get_fieldsets(request, obj)
@@ -79,7 +79,7 @@ def get_fieldsets(self, request, obj=None):
                     block=None,
                     position=-1,
                     blockname=action.verbose_name,
-                    blockattrs=dict(classes=(hash, 'action-hide')),
+                    blockattrs=dict(classes=(f"c{hash}", "action-hide")),
                 )
         return fieldsets
 
@@ -126,7 +126,7 @@ def execute(self, form, request):
             keys = {}
             defaults = {
                 "form_name": get_option(form, "form_name"),
-                "form_user": None if request.user.is_anonymous else request.user
+                "form_user": None if request.user.is_anonymous else request.user,
             }
         defaults.update(
             {
@@ -153,7 +153,9 @@ def execute(self, form, request):
 def validate_recipients(value):
     recipients = value.split()
     for recipient in recipients:
-        EmailValidator(message=_("Please replace \"%s\" by a valid email address.") % recipient)(recipient)
+        EmailValidator(
+            message=_('Please replace "%s" by a valid email address.') % recipient
+        )(recipient)
 
 
 @register
@@ -199,17 +201,25 @@ def execute(self, form, request):
             cleaned_data=form.cleaned_data,
             form_name=getattr(form.Meta, "verbose_name", ""),
             user=request.user,
-            user_agent=request.headers["User-Agent"] if "User-Agent" in request.headers else "",
+            user_agent=request.headers["User-Agent"]
+            if "User-Agent" in request.headers
+            else "",
             referer=request.headers["Referer"] if "Referer" in request.headers else "",
         )
 
-        html_message = render_to_string(f"djangocms_form_builder/mails/{template_set}/mail_html.html", context)
+        html_message = render_to_string(
+            f"djangocms_form_builder/mails/{template_set}/mail_html.html", context
+        )
         try:
-            message = render_to_string(f"djangocms_form_builder/mails/{template_set}/mail.txt", context)
+            message = render_to_string(
+                f"djangocms_form_builder/mails/{template_set}/mail.txt", context
+            )
         except TemplateDoesNotExist:
             message = strip_tags(html_message)
         try:
-            subject = render_to_string(f"djangocms_form_builder/mails/{template_set}/subject.txt", context)
+            subject = render_to_string(
+                f"djangocms_form_builder/mails/{template_set}/subject.txt", context
+            )
         except TemplateDoesNotExist:
             subject = self.subject % dict(form_name=context["form_name"])
 
@@ -254,7 +264,9 @@ def execute(self, form, request):
         message = self.get_parameter(form, "submitmessage_message")
         # Overwrite the success context and render template
         form.get_success_context = lambda *args, **kwargs: {"message": message}
-        form.Meta.options["render_success"] = "djangocms_form_builder/actions/submit_message.html"
+        form.Meta.options["render_success"] = (
+            "djangocms_form_builder/actions/submit_message.html"
+        )
         # Overwrite the default redirect to same page
         if form.Meta.options.get("redirect") == SAME_PAGE_REDIRECT:
             form.Meta.options["redirect"] = None
@@ -280,5 +292,12 @@ class Meta:
             required=True,
         )
 
+        def __init__(self, *args, **kwargs):
+            super().__init__(*args, **kwargs)
+            if args:
+                self.fields["redirect_link"].required = get_hash(RedirectAction) in args[0].get("form_actions", [])
+
         def execute(self, form, request):
-            form.Meta.options["redirect"] = get_link(self.get_parameter(form, "redirect_link"))
+            form.Meta.options["redirect"] = get_link(
+                self.get_parameter(form, "redirect_link")
+            )

djangocms_form_builder/cms_plugins/__init__.py

@@ -10,6 +10,7 @@
     EmailFieldPlugin,
     IntegerFieldPlugin,
     SelectPlugin,
+    SubmitPlugin,
     TextareaPlugin,
     TimeFieldPlugin,
     URLFieldPlugin,
@@ -26,6 +27,7 @@
     "EmailFieldPlugin",
     "IntegerFieldPlugin",
     "SelectPlugin",
+    "SubmitPlugin",
     "TextareaPlugin",
     "TimeFieldPlugin",
     "URLFieldPlugin",

djangocms_form_builder/cms_plugins/ajax_plugins.py

@@ -240,11 +240,24 @@ def render(self, context, instance, placeholder):
         form = self.get_ajax_form()
         context.update(self.set_context(context, instance, placeholder))
         context["form_counter"] = context.get("form_counter", 0) + 1
-        context.update({
-            "instance": instance,
-            "form": form,
-            "uid": f"{instance.id}{getattr(form, 'slug', '')}-{context['form_counter']}",
-        })
+
+        def has_submit_button(plugins):
+            for child in plugins:
+                if child.plugin_type == "SubmitPlugin":
+                    return True
+                child_plugins = getattr(child, "child_plugin_instances", None) or []
+                if has_submit_button(child_plugins):
+                    return True
+            return False
+
+        context.update(
+            {
+                "instance": instance,
+                "form": form,
+                "uid": f"{instance.id}{getattr(form, 'slug', '')}-{context['form_counter']}",
+                "has_submit_button": has_submit_button(instance.child_plugin_instances),
+            }
+        )
         return context
 
 
@@ -290,7 +303,9 @@ def get_parent_classes(cls, slot, page, instance=None):
 
     def get_fieldsets(self, request, obj=None):
         fieldsets = super().get_fieldsets(request, obj)
-        if obj is None or not obj.form_selection:  # No Actions if a Django form has been selected
+        if (
+            obj is None or not obj.form_selection
+        ):  # No Actions if a Django form has been selected
             fieldsets = insert_fields(
                 fieldsets,
                 ("form_actions",),
@@ -362,22 +377,28 @@ def traverse(instance):
         meta_options = dict(form_name=self.instance.form_name)
         if self.instance.form_floating_labels:
             meta_options["floating_labels"] = True
-        meta_options[
-            "field_sep"
-        ] = f'{self.instance.form_spacing}'
-        meta_options[
-            "redirect"
-        ] = SAME_PAGE_REDIRECT  # Default behavior: redirect to same page
+        meta_options["field_sep"] = f"{self.instance.form_spacing}"
+        meta_options["redirect"] = (
+            SAME_PAGE_REDIRECT  # Default behavior: redirect to same page
+        )
         meta_options["login_required"] = self.instance.form_login_required
         meta_options["unique"] = self.instance.form_unique
         form_actions = self.instance.form_actions or "[]"
         meta_options["form_actions"] = json.loads(form_actions.replace("'", '"'))
-        meta_options["form_parameters"] = getattr(self.instance, "action_parameters", {})
+        meta_options["form_parameters"] = getattr(
+            self.instance, "action_parameters", {}
+        )
 
-        fields["Meta"] = type("Meta", (), dict(
-            options=meta_options,
-            verbose_name=self.instance.form_name.replace("-", " ").replace("_", " ").capitalize(),
-        ))  # Meta class with options and verbose name
+        fields["Meta"] = type(
+            "Meta",
+            (),
+            dict(
+                options=meta_options,
+                verbose_name=self.instance.form_name.replace("-", " ")
+                .replace("_", " ")
+                .capitalize(),
+            ),
+        )  # Meta class with options and verbose name
 
         return type(
             "FrontendAutoForm",

djangocms_form_builder/cms_plugins/form_plugins.py

@@ -19,6 +19,9 @@ class FormElementPlugin(AttributesMixin, CMSPluginBase):
     render_template = f"djangocms_form_builder/{settings.framework}/widgets/base.html"
     change_form_template = "djangocms_frontend/admin/base.html"
     settings_name = _("Settings")
+    # Form elements are rendered by the surrounding FormPlugin, hence any change has to be
+    # propageted up to the FormPlugin:
+    is_local = False
 
     fieldsets = (
         (

djangocms_form_builder/cms_plugins/legacy.py

@@ -1,7 +1,7 @@
 from cms.plugin_pool import plugin_pool
 from django.conf import settings
 
-if 'djangocms_frontend.contrib.frontend_forms' in settings.INSTALLED_APPS:
+if "djangocms_frontend.contrib.frontend_forms" in settings.INSTALLED_APPS:
     from djangocms_frontend.contrib.frontend_forms.cms_plugins import (
         BooleanFieldPlugin,
         CharFieldPlugin,