Bugzilla – Attachment 98345 Details for
Bug 18936
Move issuingrules into circulation_rules
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18936: Remove 2 new occurrences of Koha::IssuingRules
Bug-18936-Remove-2-new-occurrences-of-KohaIssuingR.patch (text/plain), 1.90 KB, created by
Jonathan Druart
on 2020-02-03 16:09:52 UTC
(
hide
)
Description:
Bug 18936: Remove 2 new occurrences of Koha::IssuingRules
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2020-02-03 16:09:52 UTC
Size:
1.90 KB
patch
obsolete
>From b027d319c2c96630f1f2c8bf5e6e46677432bbe2 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Mon, 3 Feb 2020 12:27:40 +0100 >Subject: [PATCH] Bug 18936: Remove 2 new occurrences of Koha::IssuingRules >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Fix conflict with bug 13121 > >Signed-off-by: Joonas Kylmälä <joonas.kylmala@helsinki.fi> >--- > opac/opac-shelves.pl | 2 +- > opac/opac-tags.pl | 3 ++- > 2 files changed, 3 insertions(+), 2 deletions(-) > >diff --git a/opac/opac-shelves.pl b/opac/opac-shelves.pl >index e9dfa25045..afb0f5e7e6 100755 >--- a/opac/opac-shelves.pl >+++ b/opac/opac-shelves.pl >@@ -281,7 +281,7 @@ if ( $op eq 'view' ) { > > my $art_req_itypes; > if( C4::Context->preference('ArticleRequests') ) { >- $art_req_itypes = Koha::IssuingRules->guess_article_requestable_itemtypes({ $patron ? ( categorycode => $patron->categorycode ) : () }); >+ $art_req_itypes = Koha::CirculationRules->guess_article_requestable_itemtypes({ $patron ? ( categorycode => $patron->categorycode ) : () }); > } > > my @items; >diff --git a/opac/opac-tags.pl b/opac/opac-tags.pl >index 44a38355c1..39e756a3cd 100755 >--- a/opac/opac-tags.pl >+++ b/opac/opac-tags.pl >@@ -48,6 +48,7 @@ use C4::XSLT; > use Data::Dumper; > > use Koha::Biblios; >+use Koha::CirculationRules; > > my %newtags = (); > my @deltags = (); >@@ -239,7 +240,7 @@ if ($loggedinuser) { > > my $art_req_itypes; > if( C4::Context->preference('ArticleRequests') ) { >- $art_req_itypes = Koha::IssuingRules->guess_article_requestable_itemtypes({ $patron ? ( categorycode => $patron->categorycode ) : () }); >+ $art_req_itypes = Koha::CirculationRules->guess_article_requestable_itemtypes({ $patron ? ( categorycode => $patron->categorycode ) : () }); > } > > # get biblionumbers stored in the cart >-- >2.11.0
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 18936
:
65247
|
65248
|
65249
|
67629
|
67758
|
68236
|
71034
|
71035
|
71036
|
71037
|
71038
|
71039
|
71040
|
71041
|
72230
|
72231
|
72232
|
72233
|
72234
|
72235
|
72236
|
72237
|
72238
|
91953
|
91954
|
91955
|
91956
|
91957
|
91958
|
91959
|
91960
|
91961
|
91962
|
91963
|
91964
|
91965
|
91966
|
91967
|
91968
|
91969
|
91970
|
91971
|
91972
|
91973
|
91974
|
91975
|
94179
|
94180
|
94181
|
94182
|
94183
|
94184
|
94185
|
94186
|
94187
|
94188
|
94189
|
94190
|
94191
|
94192
|
94193
|
94194
|
94195
|
94196
|
94197
|
94198
|
94199
|
94200
|
98299
|
98300
|
98301
|
98302
|
98303
|
98304
|
98305
|
98306
|
98307
|
98308
|
98309
|
98310
|
98311
|
98312
|
98313
|
98314
|
98315
|
98316
|
98317
|
98318
|
98319
|
98320
|
98321
|
98322
|
98323
|
98324
|
98325
|
98326
|
98327
|
98328
|
98329
|
98330
|
98331
|
98332
|
98333
|
98334
|
98335
|
98336
|
98337
|
98338
|
98339
|
98340
|
98341
|
98342
|
98343
|
98344
| 98345 |
98346
|
98347
|
98407
|
98408