fixed: usage of wrong button type in group edit notification settings

ColdTrick · Aug 12, 2024 · 3f23ca3 · 3f23ca3
1 parent 504f88b
commit 3f23ca3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/views/default/group_tools/extends/groups/edit/settings/notifications.mjs b/views/default/group_tools/extends/groups/edit/settings/notifications.mjs
@@ -0,0 +1,10 @@
+import 'jquery';
+import elgg from 'elgg';
+import spinner from 'elgg/spinner';
+
+$(document).on('click', '#group-tools-edit-notifications', function (event) {
+	var $form = $(this).closest('form');
+	$form.prop('action', elgg.normalize_url('action/group_tools/admin/notifications'));
+	spinner.start();
+	$form.submit();
+});
diff --git a/views/default/group_tools/extends/groups/edit/settings/notifications.php b/views/default/group_tools/extends/groups/edit/settings/notifications.php
@@ -20,6 +20,8 @@
 	return;
 }
 
+elgg_import_esm('group_tools/extends/groups/edit/settings/notifications');
+
 $content = '';
 
 // notification settings
@@ -95,19 +97,18 @@ function(QueryBuilder $qb, $main_alias) use ($method) {
 }
 
 $buttons[] = [
-	'#type' => 'submit',
+	'#type' => 'button',
+	'id' => 'group-tools-edit-notifications',
 	'text' => elgg_echo('group_tools:notifications:enable'),
 	'title' => elgg_echo('group_tools:notifications:disclaimer'),
 	'confirm' => true,
-	'formaction' => elgg_generate_action_url('group_tools/admin/notifications', [], false),
+	'class' => 'elgg-button-action',
 ];
 
-if (!empty($buttons)) {
-	$content .= elgg_view_field([
-		'#type' => 'fieldset',
-		'fields' => $buttons,
-		'align' => 'horizontal',
-	]);
-}
+$content .= elgg_view_field([
+	'#type' => 'fieldset',
+	'fields' => $buttons,
+	'align' => 'horizontal',
+]);
 
 echo elgg_view_module('info', elgg_echo('group_tools:notifications:title'), $content);