From 5d3e8b36341c45644a6e883f82fdfc6e72ba2168 Mon Sep 17 00:00:00 2001 From: William Lavoie Date: Mon, 27 Jan 2025 14:49:24 -0500 Subject: [PATCH] Bug 38040: Prevent editing other libraries' holds when IndependentBranches is enabled --- .../intranet-tmpl/prog/en/modules/reserve/request.tt | 4 ++-- reserve/request.pl | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) 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 b625fd36d7..00720dbe06 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -1866,8 +1866,8 @@ return false; }); - [% IF (!is_super_librarian) %] - var user_branch = "[% user_branch %]"; + [% IF (!CAN_user_superlibrarian) %] + var user_branch = "[% Branches.GetLoggedInBranchcode %]"; if(user_branch !== undefined && user_branch !== ""){ $('#patron_holds_table tbody tr').each(function() { var link = $(this).find('a[href*="member"]'); diff --git a/reserve/request.pl b/reserve/request.pl index d06b6a5aba..c8006385bd 100755 --- a/reserve/request.pl +++ b/reserve/request.pl @@ -121,10 +121,10 @@ if ( $op eq 'cud-move' ) { } } elsif ( $op eq 'cud-cancel' ) { - my $reserve_id = $input->param('reserve_id'); - my $cancellation_reason = $input->param("cancellation-reason"); - my $hold = Koha::Holds->find($reserve_id); - $hold->cancel( { cancellation_reason => $cancellation_reason } ) if $hold; + my $reserve_id = $input->param('reserve_id'); + my $cancellation_reason = $input->param("cancellation-reason"); + my $hold = Koha::Holds->find($reserve_id); + $hold->cancel( { cancellation_reason => $cancellation_reason } ) if $hold; } elsif ( $op eq 'cud-setLowestPriority' ) { my $reserve_id = $input->param('reserve_id'); -- 2.43.0