From 0b41d38ddf87102fe4a20f0075ece731308d9a7e Mon Sep 17 00:00:00 2001 From: Pedro Amorim Date: Tue, 15 Jul 2025 12:37:53 +0000 Subject: [PATCH] Bug 40395: Preparation: DRY cancel_hold_modal --- .../en/includes/modals/holds_table_modals.inc | 44 +++++++++++++++++++ .../prog/en/modules/reserve/request.tt | 40 +---------------- 2 files changed, 46 insertions(+), 38 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/modals/holds_table_modals.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/holds_table_modals.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/holds_table_modals.inc new file mode 100644 index 00000000000..13276930439 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/holds_table_modals.inc @@ -0,0 +1,44 @@ +[% BLOCK 'cancel-hold-modal' %] + +[% END %] \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt index 1a949d3c4b8..f4a01f47bc9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -22,6 +22,7 @@ [% SET categories = Categories.all.unblessed %] [% SET columns = ['name', 'cardnumber', 'dateofbirth', 'category', 'branch', 'address', 'phone'] %] [% PROCESS "patron-search.inc" %] +[% PROCESS 'modals/holds_table_modals.inc' %] [% FILTER collapse %] [% UNLESS ( multi_hold ) %] @@ -1377,45 +1378,8 @@ [% END # UNLESS patron %] [% END %] -<div id="cancelModal" class="modal" tabindex="-1" role="dialog" aria-hidden="true"> - <div class="modal-dialog"> - <div class="modal-content"> - <div class="modal-header"> - <h1 class="modal-title">Confirm deletion</h1> - <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> - </div> - - <form id="cancel_modal_form" method="post" action="request.pl"> - [% INCLUDE 'csrf-token.inc' %] - <div id="inputs"> - <input type="hidden" name="op" value="cud-cancel" /> - </div> - - <div class="modal-body"> - <p>Are you sure you want to cancel this hold?</p> - <div id="cancel_hold_alert" class="alert alert-danger" style="display:none;"></div> - <fieldset class="action"> - [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %] - [% IF hold_cancellation.count %] - <label for="modal-cancellation-reason">Cancellation reason: </label> - <select class="cancellation-reason" name="cancellation-reason" id="modal-cancellation-reason"> - <option value="">No reason given</option> - [% FOREACH reason IN hold_cancellation %] - <option value="[% reason.authorised_value | html %]">[% reason.lib | html %]</option> - [% END %] - </select> - [% END %] - </fieldset> - </div> +[% PROCESS 'cancel-hold-modal' form_action = 'request.pl' %] - <div class="modal-footer"> - <button id="cancelModalConfirmBtn" type="submit" class="btn btn-danger">Confirm cancellation</button> - <button type="button" class="btn btn-default" data-bs-dismiss="modal">Cancel</button> - </div> - </form> - </div> - </div> -</div> <div id="hold-actions"> <form id="hold-actions-form"> [% INCLUDE 'csrf-token.inc' %] </form> </div> -- 2.39.5