From 184ed070587e6b07db0c501056066c57e5de3c9b Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 3 Jan 2020 16:47:07 +0000
Subject: [PATCH] Bug 24095: Missing MSG_CONFIRM_DELETE_HOLD variable on the
 OPAC user account page

This patch corrects markup in the table of holds in the OPAC so that the
hold deletion confirmation message appears correctly. The onclick event
removed from holds-table.inc was made obsolete by Bug 21870.

To test, apply the patch and log in to the OPAC as a user who has holds.

 - From the "your summary" page in the OPAC, open the holds tab.
 - Click any "Cancel" button. You should be shown a confirmation modal.
 - Test both the confirm and cancel operations.
 - Log in to self-checkout and confirm that the holds tab there is
   unaffected: Although it uses the same include, the hold cancellation
   option isn't shown there.
---
 koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
index 3c5ea159386..cc5d854e4da 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
@@ -184,10 +184,11 @@
                         [% IF ! onlyinfo %]
                             <td class="modify">
                                 [% IF ( HOLD.is_cancelable_from_opac ) %]
-                                    <form action="/cgi-bin/koha/opac-modrequest.pl" method="post">
-                                    <input type="hidden" name="biblionumber" value="[% HOLD.biblionumber | html %]" />
-                                    <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
-                                    <button type="submit" name="submit" class="btn btn-mini btn-danger" onclick="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);"><i class="fa fa-remove"></i> Cancel</button></form>
+                                    <form action="/cgi-bin/koha/opac-modrequest.pl" id="delete_hold_[% HOLD.reserve_id | html %]" method="post">
+                                        <input type="hidden" name="biblionumber" value="[% HOLD.biblionumber | html %]" />
+                                        <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
+                                        <button data-title="[% HOLD.biblio.title | html %]" data-reserve_id="[% HOLD.reserve_id | html %]" type="submit" class="btn btn-sm btn-danger btn-delete-hold"><i class="fa fa-remove"></i> Cancel</button>
+                                    </form>
                                 [% END %]
                             </td>
                         [% END # / IF onlyinfo %]
-- 
2.11.0