Bugzilla – Attachment 108740 Details for
Bug 18501
Automatic refunds need protection from failure
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18501: (follow-up) Do not rely on userenv->{branchcode}
Bug-18501-follow-up-Do-not-rely-on-userenv-branchc.patch (text/plain), 1.51 KB, created by
Martin Renvoize
on 2020-08-20 14:33:48 UTC
(
hide
)
Description:
Bug 18501: (follow-up) Do not rely on userenv->{branchcode}
Filename:
MIME Type:
Creator:
Martin Renvoize
Created:
2020-08-20 14:33:48 UTC
Size:
1.51 KB
patch
obsolete
>From 61ac10e2c83932d9c1fa2e8958d97b6b175366d3 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Thu, 20 Aug 2020 13:28:41 +0100 >Subject: [PATCH] Bug 18501: (follow-up) Do not rely on userenv->{branchcode} > >--- > Koha/CirculationRules.pm | 4 ++-- > Koha/Item.pm | 6 ++++-- > 2 files changed, 6 insertions(+), 4 deletions(-) > >diff --git a/Koha/CirculationRules.pm b/Koha/CirculationRules.pm >index 9bf1ab860e..87062f541a 100644 >--- a/Koha/CirculationRules.pm >+++ b/Koha/CirculationRules.pm >@@ -439,8 +439,8 @@ sub get_lostreturn_policy { > > my $behaviour = C4::Context->preference( 'RefundLostOnReturnControl' ) // 'CheckinLibrary'; > my $behaviour_mapping = { >- CheckinLibrary => $params->{'return_branch'}, >- ItemHomeBranch => $item->homebranch, >+ CheckinLibrary => $params->{'return_branch'} // $item->homebranch, >+ ItemHomeBranch => $item->homebranch, > ItemHoldingBranch => $item->holdingbranch > }; > >diff --git a/Koha/Item.pm b/Koha/Item.pm >index 84ba2da33c..8dffac4db5 100644 >--- a/Koha/Item.pm >+++ b/Koha/Item.pm >@@ -811,8 +811,10 @@ sub _set_found_trigger { > return $self > unless Koha::CirculationRules->get_lostreturn_policy( > { >- current_branch => C4::Context->userenv->{branch}, >- item => $self, >+ item => $self, >+ return_branch => C4::Context->userenv >+ ? C4::Context->userenv->{'branch'} >+ : undef, > } > ); > >-- >2.20.1
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 18501
:
108004
|
108005
|
108006
|
108121
|
108122
|
108123
|
108167
|
108168
|
108169
|
108170
|
108193
|
108194
|
108195
|
108243
|
108248
|
108249
|
108291
|
108292
|
108293
|
108294
|
108295
|
108296
|
108297
|
108298
|
108299
|
108300
|
108301
|
108482
|
108483
|
108484
|
108485
|
108486
|
108487
|
108488
|
108489
|
108490
|
108491
|
108492
|
108493
|
108494
|
108575
|
108576
|
108577
|
108578
|
108579
|
108580
|
108581
|
108582
|
108583
|
108584
|
108585
|
108586
|
108596
|
108597
|
108598
|
108599
|
108600
|
108601
|
108602
|
108603
|
108604
|
108605
|
108606
|
108607
|
108608
|
108610
|
108611
|
108612
|
108613
|
108614
|
108615
|
108616
|
108617
|
108618
|
108619
|
108620
|
108621
|
108717
|
108732
|
108738
|
108739
|
108740
|
108741
|
108784
|
108785
|
108786
|
108787
|
108788
|
108795
|
111295