From 513205b5770e8ebf8d489c9ea7d671e136fc4a25 Mon Sep 17 00:00:00 2001 From: Baptiste Wojtkowski Date: Fri, 19 May 2017 09:23:17 +0000 Subject: [PATCH] Bug 18613: Remove letter rule correctly as superlibrarian TEST PLAN (reproducing bug) 1 - Set 'IndependantBranches' to enable 2 - Log in as Superlibrarian. 3 - Create 3 rules - 1 for all librairies (1) - 1 for the library of the superlibrarian (2) - 1 for another library (3) 4 - Try to delete them and see them and see that (3) isn't the good one (checking patch) 5 - Apply patch 6 - Try again 3- 7 - Connect as not superlibrarian 8 - Try again 3- Signed-off-by: Alex Buckley Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart (cherry picked from commit 648e2a2b808efac22a8b88545d53b05112a1f6f0) Signed-off-by: Fridolin Somers --- C4/Letters.pm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/C4/Letters.pm b/C4/Letters.pm index cd7b785c96..4ff95c21fc 100644 --- a/C4/Letters.pm +++ b/C4/Letters.pm @@ -203,11 +203,9 @@ sub getletter { $lang = 'default' unless( $lang && C4::Context->preference('TranslateNotices') ); - if ( C4::Context->preference('IndependentBranches') - and $branchcode - and C4::Context->userenv ) { - - $branchcode = C4::Context->userenv->{'branch'}; + my $only_my_library = C4::Context->only_my_library; + if ( $only_my_library and $branchcode ) { + $branchcode = C4::Context::mybranch(); } $branchcode //= ''; -- 2.39.5