Remove modals from DOM when hidden by default

fixes #1715

diff --git a/galette/templates/default/elements/js/modal.js.twig b/galette/templates/default/elements/js/modal.js.twig
index e3703020516259df3e4015d9bbc9d5e955a71892..6b3442de407a67df49491a4b60c1d796ce171260 100644 (file)
--- a/galette/templates/default/elements/js/modal.js.twig
+++ b/galette/templates/default/elements/js/modal.js.twig
@@ -94,7 +94,7 @@
 {% if modal_onhidden is defined %}
             {{ modal_onhidden|raw }}
 {% else %}
-            return true;
+            $(this).modal('hide dimmer').remove();
 {% endif %}
         },
         onApprove: function() {
@@ -107,6 +107,8 @@
         onDeny: function() {
 {% if modal_ondeny is defined %}
             {{ modal_ondeny|raw }}
+{% else %}
+            return true;
 {% endif %}
         },
         actions: [

diff --git a/galette/templates/default/pages/members_list.html.twig b/galette/templates/default/pages/members_list.html.twig
index 64f9e20a533e25f82cb7a079f625b7b0f4ac8ff9..852f91b39afa5480455f928d116247266deefff2 100644 (file)
--- a/galette/templates/default/pages/members_list.html.twig
+++ b/galette/templates/default/pages/members_list.html.twig
@@ -564,8 +564,7 @@
                         modal_without_title: true,
                         modal_class: "tiny",
                         modal_onshow: "_batchAjaxMapper();",
-                        modal_onapprove: "$('#attendance_sheet_details form').submit();",
-                        modal_ondeny: "$(this).modal('hide dimmer').remove();"
+                        modal_onapprove: "$('#attendance_sheet_details form').submit();"
                     } %}
                 },
                 error: function() {
@@ -655,10 +654,8 @@
                                     modal_selector: "#mass_contributions",
                                     modal_without_title: true,
                                     modal_content_class: "scrolling",
-                                    modal_onhidden: "$(this).modal('hide dimmer').remove();",
                                     modal_onshow: "_batchAjaxMapper();_formValidationInModal('#mass_contributions');",
-                                    modal_onapprove: "var submitted = _formSubmitInModal('#mass_contributions');if (!submitted){return false;}",
-                                    modal_ondeny: "$(this).modal('hide dimmer').remove();"
+                                    modal_onapprove: "var submitted = _formSubmitInModal('#mass_contributions');if (!submitted){return false;}"
                                 } %}
                             },
                             error: function() {
@@ -679,8 +676,7 @@
                         modal_without_title: true,
                         modal_class: "mini",
                         modal_onshow: "_batchAjaxMapper();",
-                        modal_onapprove: "$('#mass_contributions form').submit();",
-                        modal_ondeny: "$(this).modal('hide dimmer').remove();"
+                        modal_onapprove: "$('#mass_contributions form').submit();"
                     } %}
                 },
                 error: function() {
@@ -767,8 +763,7 @@
                                 {% include "elements/js/modal.js.twig" with {
                                     modal_selector: "#mass_change",
                                     modal_without_title: true,
-                                    modal_onapprove: "$('#mass_change form').submit();",
-                                    modal_ondeny: "$(this).modal('hide dimmer').remove();"
+                                    modal_onapprove: "$('#mass_change form').submit();"
                                 } %}
                             },
                             error: function() {
@@ -789,8 +784,7 @@
                         modal_without_title: true,
                         modal_content_class: "scrolling",
                         modal_onshow: "_massCheckboxes('#mass_change');_batchAjaxMapper();",
-                        modal_onapprove: "$('#mass_change form').submit();",
-                        modal_ondeny: "$(this).modal('hide dimmer').remove();"
+                        modal_onapprove: "$('#mass_change form').submit();"
                     } %}
                 },
                 error: function() {

diff --git a/galette/templates/default/pages/plugins.html.twig b/galette/templates/default/pages/plugins.html.twig
index 59827c0ea8d7763eef4a3bfcb28e289830c165b8..4230bfa020e63e24a1360415df6402a201846296 100644 (file)
--- a/galette/templates/default/pages/plugins.html.twig
+++ b/galette/templates/default/pages/plugins.html.twig
@@ -150,7 +150,6 @@
                         observeChanges: true,
                         closable: false
                     },
-                    modal_onhidden: "$(this).modal('hide dimmer').remove();",
                     modal_onapprove: "$('#plugins_initdb_form').submit();return false;",
                     modal_approve_text: _T("Next step")|e("js"),
                     modal_cancel_text: _T("Close")|e("js")