Bugzilla – Attachment 11892 Details for
Bug 8435
new permissions on subscriptions "superserials"
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 8435: Followup: FIX if IndependantBranches is OFF
0001-Bug-8435-Followup-FIX-if-IndependantBranches-is-OFF.patch (text/plain), 1.43 KB, created by
Jonathan Druart
on 2012-08-30 12:37:13 UTC
(
hide
)
Description:
Bug 8435: Followup: FIX if IndependantBranches is OFF
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2012-08-30 12:37:13 UTC
Size:
1.43 KB
patch
obsolete
>From 5faea4afac7c77e799f75d9c1c48d22db377921e Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >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 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 8435
:
10821
|
11377
|
11411
|
11892
|
13396
|
15673
|
16404
|
16462
|
16740
|
16750
|
16751
|
16798
|
16799
|
16801
|
16802
|
16803
|
16943
|
16944
|
19260
|
19261
|
19266
|
19268
|
20536
|
21286
|
21287
|
21288
|
21289
|
22624
|
22625
|
22626
|
22627
|
22628