From eb79cdad2fdad5f36f26f77d2b3b4cbb51ff2efb Mon Sep 17 00:00:00 2001
From: Rohan Shaw <rohnsha0@gmail.com>
Date: Fri, 8 Nov 2024 01:21:52 +0530
Subject: [PATCH 1/3] Fixes proper pat-plone-modal config to show user addition
 info

---
 .../CMFPlone/controlpanel/browser/usergroups_usersoverview.pt  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Products/CMFPlone/controlpanel/browser/usergroups_usersoverview.pt b/Products/CMFPlone/controlpanel/browser/usergroups_usersoverview.pt
index 4ba04fb288..fb3c8f1e03 100644
--- a/Products/CMFPlone/controlpanel/browser/usergroups_usersoverview.pt
+++ b/Products/CMFPlone/controlpanel/browser/usergroups_usersoverview.pt
@@ -64,7 +64,8 @@
              data-pat-plone-modal='{
                 "actionOptions": {
                   "redirectOnResponse": true,
-                  "redirectToUrl": "${portal_url}/@@usergroup-userprefs"
+                  "redirectToUrl": "${portal_url}/@@usergroup-userprefs",
+                  "disableAjaxFormSubmit": true
                 }
               }'
              tal:attributes="href string:${portal_url}/@@new-user"

From 25599ce7b7f69d1e81a2a83bc9b0f2ea275165c6 Mon Sep 17 00:00:00 2001
From: Rohan Shaw <rohnsha0@gmail.com>
Date: Mon, 11 Nov 2024 22:16:19 +0530
Subject: [PATCH 2/3] disabled ajax and removed unneccesary redirection

---
 .../controlpanel/browser/usergroups_groupsoverview.pt    | 9 +++++++--
 .../controlpanel/browser/usergroups_usersoverview.pt     | 3 +--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Products/CMFPlone/controlpanel/browser/usergroups_groupsoverview.pt b/Products/CMFPlone/controlpanel/browser/usergroups_groupsoverview.pt
index 8dbeadaa8b..f4cd559cef 100644
--- a/Products/CMFPlone/controlpanel/browser/usergroups_groupsoverview.pt
+++ b/Products/CMFPlone/controlpanel/browser/usergroups_groupsoverview.pt
@@ -73,6 +73,12 @@
 
             <div class="mb-3 input-group">
                 <a class="pat-plone-modal btn btn-success me-3" id="add-group"
+                    data-pat-plone-modal= '{
+                        "content": "#content-core",
+                        "actionOptions": {
+                            "disableAjaxFormSubmit": true
+                        }
+                    }'
                     tal:attributes="href string:${portal_url}/@@usergroup-groupdetails"
                     i18n:translate="label_add_new_group">Add New Group</a>
                 <span class="input-group-text" id="quickSearchLabel" i18n:translate="label_group_search">Group Search</span>
@@ -211,5 +217,4 @@
 
 </metal:main>
 </body>
-</html>
-
+</html>
\ No newline at end of file
diff --git a/Products/CMFPlone/controlpanel/browser/usergroups_usersoverview.pt b/Products/CMFPlone/controlpanel/browser/usergroups_usersoverview.pt
index fb3c8f1e03..7b027a81f7 100644
--- a/Products/CMFPlone/controlpanel/browser/usergroups_usersoverview.pt
+++ b/Products/CMFPlone/controlpanel/browser/usergroups_usersoverview.pt
@@ -62,9 +62,8 @@
         <div class="mb-3 input-group">
           <a class="pat-plone-modal me-3 btn btn-success " id="add-user"
              data-pat-plone-modal='{
+                "content": "#content-core",
                 "actionOptions": {
-                  "redirectOnResponse": true,
-                  "redirectToUrl": "${portal_url}/@@usergroup-userprefs",
                   "disableAjaxFormSubmit": true
                 }
               }'

From e8e4e9c7bb89626bc6452fab1e853789e6407dfa Mon Sep 17 00:00:00 2001
From: Rohan Shaw <rohnsha0@gmail.com>
Date: Mon, 11 Nov 2024 22:16:27 +0530
Subject: [PATCH 3/3] changelog

---
 news/4044.bugfix | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 news/4044.bugfix

diff --git a/news/4044.bugfix b/news/4044.bugfix
new file mode 100644
index 0000000000..4b427391b1
--- /dev/null
+++ b/news/4044.bugfix
@@ -0,0 +1,2 @@
+Disable AJAX form submission upon user and group addition
+[rohnsha0] 
\ No newline at end of file