From 5faea4afac7c77e799f75d9c1c48d22db377921e Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 30 Aug 2012 14:36:23 +0200 Subject: [PATCH 1/1] Bug 8435: Followup: FIX if IndependantBranches is OFF --- C4/Serials.pm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/C4/Serials.pm b/C4/Serials.pm index e6cd41f..8b4576f 100644 --- a/C4/Serials.pm +++ b/C4/Serials.pm @@ -2359,14 +2359,13 @@ sub can_edit_subscription { my ( $subscription, $userid ) = @_; my $flags = C4::Context->userenv->{flags}; $userid ||= C4::Context->userenv->{'id'}; - if( C4::Context->preference('IndependantBranches') - and ( - $flags % 2 == 1 - or C4::Auth::haspermission( $userid, {serials => 'superserials'}), - or not defined $subscription->{branchcode} - or $subscription->{branchcode} eq '' - or $subscription->{branchcode} eq C4::Context->userenv->{'branch'} - ) + my $independant_branches = C4::Context->preference('IndependantBranches'); + return 1 unless $independant_branches; + if( $flags % 2 == 1 + or C4::Auth::haspermission( $userid, {serials => 'superserials'}), + or not defined $subscription->{branchcode} + or $subscription->{branchcode} eq '' + or $subscription->{branchcode} eq C4::Context->userenv->{'branch'} ) { return 1; } -- 1.7.10.4