fix: improve url registration

Author: fsbraun

djangocms_form_builder/apps.py

@@ -2,7 +2,7 @@
 
 from django.apps import AppConfig
 from django.conf import settings
-from django.urls import NoReverseMatch, clear_url_caches, include, path, reverse
+from django.urls import clear_url_caches, include, path
 from django.utils.translation import gettext_lazy as _
 
 
@@ -11,20 +11,23 @@ class FormsConfig(AppConfig):
     name = "djangocms_form_builder"
     verbose_name = _("Form builder")
 
+    patterns_added = False
+
     def ready(self):
         """Install the URLs"""
-        try:
-            reverse("form_builder:ajaxview", args=(1,))
-        except NoReverseMatch:  # Not installed yet
-            urlconf_module = import_module(settings.ROOT_URLCONF)
-            urlconf_module.urlpatterns = [
-                path(
-                    "@form-builder/",
-                    include(
-                        "djangocms_form_builder.urls",
-                        namespace="form_builder",
-                    ),
-                )
-            ] + urlconf_module.urlpatterns
-            clear_url_caches()
-            reverse("form_builder:ajaxview", args=(1,))
+        if self.patterns_added:
+            return
+        self.patterns_added = True
+        urlconf_module = import_module(settings.ROOT_URLCONF)
+        # Add the new URL pattern
+        urlconf_module.urlpatterns = [
+            path(
+                "@form-builder/",
+                include(
+                    "djangocms_form_builder.urls",
+                    namespace="form_builder",
+                ),
+            )
+        ] + urlconf_module.urlpatterns
+        # Clear the URL cache
+        clear_url_caches()

djangocms_form_builder/cms_plugins/ajax_plugins.py

@@ -297,7 +297,7 @@ def get_parent_classes(cls, slot, page, instance=None):
         parent = instance
         while parent is not None:
             if parent.plugin_type == cls.__name__:
-                return [""]
+                return ["0"]
             parent = parent.parent
         return super().get_parent_classes(slot, page, instance)
 

djangocms_form_builder/templates/djangocms_form_builder/ajax_form.html

@@ -105,8 +105,8 @@
             }
 
             function post_ajax(node) {
-                fetch(node.getAttribute('action'),{
-                    method: 'POST',
+                fetch(node.getAttribute('action'), {
+                    method: node.getAttribute('method') || 'POST',
                     body: new URLSearchParams(new FormData(node)),
                     }
                 ).then(function (response) {
@@ -135,8 +135,9 @@
                                 grecaptcha.reset(gid);
                             },
                         });
-                        if(!form.dataset.submitEvent) {
+                        if(!false) {
                             form.dataset.submitEvent = true;
+                            console.log("recaptcha submit added");
                             form.addEventListener('submit', function (event) {
                                 event.preventDefault();
                                 console.log("recaptcha submit")
@@ -146,8 +147,9 @@
                     }
                 }, 100);
             } else {
-                if(!form.dataset.submitEvent) {
+                if(true) {
                     form.dataset.submitEvent = true;
+                    console.log("submit added");
                     form.addEventListener('submit', function (event) {
                         event.preventDefault();
                         post_ajax(form);
@@ -161,11 +163,10 @@
     (function () {
         function initForms() {
             for (let form of document.getElementsByClassName('djangocms-form-builder-ajax-form')) {
-
                 djangocms_form_builder_form(form);
             }
         }
-        window.addEventListener('DOMContentLoaded', initForms);
+        window.addEventListener('load', initForms);
         {% if request.toolbar and request.toolbar.edit_mode_active %}
             CMS.$(window).on('cms-content-refresh', initForms);
         {% endif %}

djangocms_form_builder/views.py

@@ -37,7 +37,7 @@ class AjaxView(View):
     Methods
     -------
 
-    dispatch(request, \*args, \*\*kwargs)
+    dispatch(request, *args, **kwargs)
         Overrides the default dispatch method to handle AJAX requests.
 
     decode_path(path)
@@ -46,10 +46,10 @@ class AjaxView(View):
     plugin_instance(pk)
         Retrieves the plugin instance and its associated model instance by primary key.
 
-    ajax_post(request, \*args, \*\*kwargs)
+    ajax_post(request, *args, **kwargs)
         Handles AJAX POST requests. Calls the `ajax_post` method of the plugin or form instance if available.
 
-    ajax_get(request, \*args, \*\*kwargs)
+    ajax_get(request, *args, **kwargs)
         Handles AJAX GET requests. Calls the `ajax_get` method of the plugin or form instance if available.
     """
     def dispatch(self, request, *args, **kwargs):
@@ -93,8 +93,8 @@ def ajax_post(self, request, *args, **kwargs):
 
         Args:
             request (HttpRequest): The HTTP request object.
-            \*args: Additional positional arguments.
-            \*\*kwargs: Additional keyword arguments, which may include:
+            *args: Additional positional arguments.
+            **kwargs: Additional keyword arguments, which may include:
                 - instance_id (int): The ID of the plugin instance.
                 - parameter (str): Optional parameter for decoding.
                 - form_id (str): The ID of the form instance.
@@ -145,8 +145,8 @@ def ajax_get(self, request, *args, **kwargs):
 
         Args:
             request (HttpRequest): The HTTP request object.
-            \*args: Additional positional arguments.
-            \*\*kwargs: Additional keyword arguments.
+            *args: Additional positional arguments.
+            **kwargs: Additional keyword arguments.
 
         Returns:
             JsonResponse: A JSON response with the result of the AJAX request.