From 9f99265f348c9e2699e7b8c9665a51860b18ae21 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Fri, 26 Jan 2024 10:52:54 -0500
Subject: [PATCH] Bug 34478: Manual fix - Rename action with op change to post
 - merge-patrons

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../prog/en/modules/members/merge-patrons.tt             | 9 +++++----
 members/merge-patrons.pl                                 | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
index 221296d9af..51bfd38ac7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
@@ -102,7 +102,7 @@
             [% INCLUDE 'messages.inc' %]
             <h1>Merge patron records</h1>
 
-            [% IF action == 'show' %]
+            [% IF op == 'show' %]
                 [% IF patrons.count > 1 %]
                     [% IF ( patrons.count == 2 ) %]
                         <div id="toolbar" class="btn-toolbar">
@@ -116,7 +116,8 @@
 
                     <p>Select patron to keep. Data from the other patrons will be transferred to this patron record and the remaining patron records will be deleted.</p>
 
-                    <form method="get" type="post" action="merge-patrons.pl" id="patron-merge-form">
+                    <form method="post" action="merge-patrons.pl" id="patron-merge-form">
+                        [% INCLUDE 'csrf-token.inc' %]
                         <table id="patron-merge-table" class="datatable">
                             <thead>
                                 <tr>
@@ -157,7 +158,7 @@
                             [% FOREACH p IN patrons %]
                                 <input type="hidden" name="id" value="[% p.id | html %]" />
                             [% END %]
-                            <input type="hidden" name="action" value="merge" />
+                            <input type="hidden" name="op" value="cud-merge" />
                             <input type="submit" id="merge-patrons" class="btn btn-primary" value="Merge patrons" />
                             [% PROCESS 'members-patron-selections.inc' id="patron-merge-form" %]
                         </fieldset>
@@ -166,7 +167,7 @@
                         <div class="dialog alert">Error: Two or more patrons need to be selected for merging</div>
                     [% END %]
                 </form>
-            [% ELSIF action == 'merge' %]
+            [% ELSIF op == 'cud-merge' %]
                 <h4>Results</h4>
                 [% IF error %]
                     [% IF error == 'INVALID_KEEPER' %]
diff --git a/members/merge-patrons.pl b/members/merge-patrons.pl
index 8109e1c44a..5ceea2a9cb 100755
--- a/members/merge-patrons.pl
+++ b/members/merge-patrons.pl
@@ -37,13 +37,13 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
     }
 );
 
-my $action = $cgi->param('action') || 'cud-show';
+my $op = $cgi->param('op') || 'show';
 my @ids    = $cgi->multi_param('id');
 
-if ( $action eq 'cud-show' ) {
+if ( $op eq 'show' ) {
     my $patrons = Koha::Patrons->search({ borrowernumber => { -in => \@ids } });
     $template->param( patrons => $patrons );
-} elsif ( $action eq 'merge' ) {
+} elsif ( $op eq 'cud-merge' ) {
     my $keeper_id = $cgi->param('keeper');
     my $results;
 
@@ -65,7 +65,7 @@ if ( $action eq 'cud-show' ) {
     }
 }
 
-$template->param( action => $action );
+$template->param( op => $op );
 
 output_html_with_http_headers $cgi, $cookie, $template->output;
 
-- 
2.39.5