From 4bb0a86e307b8d08b2c0788f28f5c2649034fc2f Mon Sep 17 00:00:00 2001 From: Baptiste Wojtkowski Date: Fri, 19 May 2017 09:23:17 +0000 Subject: [PATCH] Bug 18613: Correct the behaviour 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- --- C4/Letters.pm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/C4/Letters.pm b/C4/Letters.pm index cf13bae..8fe6289 100644 --- a/C4/Letters.pm +++ b/C4/Letters.pm @@ -203,11 +203,9 @@ sub getletter { my ( $module, $code, $branchcode, $message_transport_type ) = @_; $message_transport_type //= '%'; - 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 = $only_my_library; } $branchcode //= ''; -- 2.7.4