From 7947f7872b23674b3e032bbeb97faf74569f97d5 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 20 Feb 2024 15:37:42 +0000
Subject: [PATCH] Bug 34478: Fix various parameters on housebound details page

This patch converts the delivery delete buttons to a form and changes
the corresponding op check in the script.

The patch also fixes an error in the form markup and corrects the op
parameter name in several links.

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

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
index 2f88b881c9..b304ea4d4d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
@@ -249,9 +249,8 @@
             <!-- Create or edit housebound_visit -->
             [% ELSIF ( op == 'visit_update_or_create' ) %]
               <h4>Manage housebound deliveries</h4>
-              <form name="form" id="instance_form" method="post"
+              <form name="form" id="instance_form" method="post" action="/cgi-bin/koha/members/housebound.pl">
                   [% INCLUDE 'csrf-token.inc' %]
-                    action="/cgi-bin/koha/members/housebound.pl">
                 [% IF ( visit ) %]
                   <input type="hidden" name="op" value="cud-editvisitconfirm" />
                   <input type="hidden" name="visit_id" value="[% visit.id | html %]" />
@@ -381,7 +380,7 @@
                 <div class="page-section">
                     [% PROCESS 'homebound-details' %]
                     <div class="action">
-                        <a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber | html %]&method=update_or_create"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
+                        <a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber | html %]&op=update_or_create"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
                     </div>
                 </div> <!-- /.page-section -->
 
@@ -415,8 +414,14 @@
                                             </a>
                                         </td>
                                         <td class="actions">
-                                            <a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/housebound.pl?method=visit_update_or_create&visit_id=[% entry.id | html %]&borrowernumber=[% patron.borrowernumber | html %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
-                                            <a class="delete btn btn-default btn-xs" href="/cgi-bin/koha/members/housebound.pl?method=visit_delete&visit_id=[% entry.id | html %]&borrowernumber=[% patron.borrowernumber | html %]"><i class="fa fa-trash-can"></i> Delete</a>
+                                            <a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/housebound.pl?op=visit_update_or_create&visit_id=[% entry.id | html %]&borrowernumber=[% patron.borrowernumber | html %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
+                                            <form action="/cgi-bin/koha/members/housebound.pl" method="post">
+                                                [% INCLUDE 'csrf-token.inc' %]
+                                                <input type="hidden" name="op" value="cud-visit_delete" />
+                                                <input type="hidden" name="visit_id" value="[% entry.id | html %]" />
+                                                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
+                                                <button class="delete btn btn-default btn-xs"><i class="fa fa-trash-can"></i> Delete</button>
+                                            </form>
                                         </td>
                                     </tr>
                                 [% END %]
@@ -424,7 +429,7 @@
                         </table>
                     [% END %]
                     <div class="action">
-                    <a href="/cgi-bin/koha/members/housebound.pl?method=visit_update_or_create&borrowernumber=[% patron.borrowernumber | uri %]"
+                    <a href="/cgi-bin/koha/members/housebound.pl?op=visit_update_or_create&borrowernumber=[% patron.borrowernumber | uri %]"
                         class="btn btn-default btn-sm">
                         <i class="fa fa-plus"></i> Add a new delivery
                     </a>
@@ -449,7 +454,7 @@
     [% INCLUDE 'columns_settings.inc' %]
     <script>
         $(document).ready(function() {
-            $("a.delete").click(function(){
+            $(".delete").click(function(){
                 return confirm(_("Are you sure you want to delete this delivery?"));
             });
         });
diff --git a/members/housebound.pl b/members/housebound.pl
index 3bc7c88136..86076171ce 100755
--- a/members/housebound.pl
+++ b/members/housebound.pl
@@ -112,7 +112,7 @@ if ( $op eq 'cud-updateconfirm' and $houseboundprofile ) {
     $deliverers = Koha::Patrons->search_housebound_deliverers;
     $choosers = Koha::Patrons->search_housebound_choosers;
     $houseboundvisit = $visit;
-} elsif ( $op eq 'visit_delete' and $visit ) {
+} elsif ( $op eq 'cud-visit_delete' and $visit ) {
     # We want ot delete a specific visit.
     my $success = eval { return $visit->delete };
     push @messages, { type => 'error', code => 'error_on_visit_delete' }
-- 
2.39.5