Bugzilla – Attachment 194797 Details for
Bug 14962
Temp Shelving Location / On Display Module
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 14962: (QA follow-up) Fix misuse of effective_etcbranch in OPAC scripts
cb65c0f.patch (text/plain), 6.29 KB, created by
Jake Deery
on 2026-03-06 16:46:00 UTC
(
hide
)
Description:
Bug 14962: (QA follow-up) Fix misuse of effective_etcbranch in OPAC scripts
Filename:
MIME Type:
Creator:
Jake Deery
Created:
2026-03-06 16:46:00 UTC
Size:
6.29 KB
patch
obsolete
>From cb65c0f0196b9c51ebd76689c596cac08d5be002 Mon Sep 17 00:00:00 2001 >From: Jake Deery <jake.deery@openfifth.co.uk> >Date: Tue, 3 Mar 2026 09:29:23 +0000 >Subject: [PATCH] Bug 14962: (QA follow-up) Fix misuse of effective_etcbranch > in OPAC scripts > >Fixed a regression caused by an update to the nomenclature of effective_etcbranch vs. effective_etc_library (the former being an accessor for the home or holding branch's code, the latter being an accessor for the entire Koha::Library object). > >Sponsored-by: ByWater Solutions >--- > opac/opac-detail.pl | 36 ++++++++++++------------------------ > opac/opac-reserve.pl | 30 ++++++------------------------ > 2 files changed, 18 insertions(+), 48 deletions(-) > >diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl >index c9aacc45c90..2502905d297 100755 >--- a/opac/opac-detail.pl >+++ b/opac/opac-detail.pl >@@ -744,36 +744,24 @@ if ( not $viewallitems and $items->count > $max_items_to_display ) { > $item_info->{holding_branch} = $item->holding_branch; > $item_info->{home_branch} = $item->home_branch; > >- if ( C4::Context->preference('UseDisplayModule') && $item->effective_homebranch ) { >- my $effective_homebranch = $item->effective_homebranch; >- my $effective_homebranch_id = $item->effective_homebranch->branchcode; >- my $effective_homebranch_opac_info = $item->effective_homebranch->opac_info( { lang => $lang } ); >+ if ( C4::Context->preference('UseDisplayModule') && $item->effective_home_library ) { >+ my $effective_home_library = $item->effective_home_library; >+ my $effective_home_library_opac_info = $effective_home_library->opac_info( { lang => $lang } ); > >- $item_info->{home_library_info} = $effective_homebranch_opac_info >- if ($effective_homebranch_opac_info); >+ $item_info->{home_library_info} = $effective_home_library_opac_info >+ if ($effective_home_library_opac_info); > >- # If it starts with "DISPLAY:", use it as-is, otherwise look it up >- if ( $effective_homebranch_id =~ /^DISPLAY:/ ) { >- $item_info->{home_branch} = $effective_homebranch_id; >- } else { >- $item_info->{home_branch} = $effective_homebranch; >- } >+ $item_info->{home_branch} = $effective_home_library; > } > >- if ( C4::Context->preference('UseDisplayModule') && $item->effective_holdingbranch ) { >- my $effective_holdingbranch = $item->effective_holdingbranch; >- my $effective_holdingbranch_id = $item->effective_holdingbranch->branchcode; >- my $effective_holdingbranch_opac_info = $item->effective_homebranch->opac_info( { lang => $lang } ); >+ if ( C4::Context->preference('UseDisplayModule') && $item->effective_holding_library ) { >+ my $effective_holding_library = $item->effective_holding_library; >+ my $effective_holding_library_opac_info = $effective_holding_library->opac_info( { lang => $lang } ); > >- $item_info->{holding_library_info} = $effective_holdingbranch_opac_info >- if ($effective_holdingbranch_opac_info); >+ $item_info->{holding_library_info} = $effective_holding_library_opac_info >+ if ($effective_holding_library_opac_info); > >- # If it starts with "DISPLAY:", use it as-is, otherwise look it up >- if ( $effective_holdingbranch_id =~ /^DISPLAY:/ ) { >- $item_info->{holding_branch} = $effective_holdingbranch_id; >- } else { >- $item_info->{holding_branch} = $effective_holdingbranch; >- } >+ $item_info->{holding_branch} = $effective_holding_library; > } > > my $itemtype = Koha::ItemTypes->find( $item->effective_itemtype ); >diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl >index 52e60dd61d1..ef9c02c12b5 100755 >--- a/opac/opac-reserve.pl >+++ b/opac/opac-reserve.pl >@@ -350,8 +350,8 @@ foreach my $biblioNumber (@biblionumbers) { > > foreach my $item ( $items->as_list ) { > $item->{'ccode'} = $item->effective_collection_code; >- $item->holdingbranch( $item->effective_holdingbranch->branchcode ); >- $item->homebranch( $item->effective_homebranch->branchcode ); >+ $item->holdingbranch( $item->effective_holdingbranch ); >+ $item->homebranch( $item->effective_homebranch ); > > push @{ $biblioData->{items} }, $item; # FIXME Potentially a lot in memory here! > } >@@ -441,29 +441,11 @@ foreach my $biblioNum (@biblionumbers) { > $item_info->{'ccode'} = $item->effective_collection_code > if ( C4::Context->preference('UseDisplayModule') && $item->effective_collection_code ); > >- if ( C4::Context->preference('UseDisplayModule') && $item->effective_homebranch ) { >- my $effective_homebranch = $item->effective_homebranch; >- my $effective_homebranch_id = $item->effective_homebranch->branchcode; >+ $item_info->{home_branch} = $item->effective_homebranch >+ if ( C4::Context->preference('UseDisplayModule') && $item->effective_homebranch ); > >- # If it starts with "DISPLAY:", use it as-is, otherwise look it up >- if ( $effective_homebranch_id =~ /^DISPLAY:/ ) { >- $item_info->{holding_branch} = $effective_homebranch_id; >- } else { >- $item_info->{holding_branch} = $effective_homebranch; >- } >- } >- >- if ( C4::Context->preference('UseDisplayModule') && $item->effective_holdingbranch ) { >- my $effective_holdingbranch = $item->effective_holdingbranch; >- my $effective_holdingbranch_id = $item->effective_holdingbranch->branchcode; >- >- # If it starts with "DISPLAY:", use it as-is, otherwise look it up >- if ( $effective_holdingbranch_id =~ /^DISPLAY:/ ) { >- $item_info->{home_branch} = $effective_holdingbranch_id; >- } else { >- $item_info->{home_branch} = $effective_holdingbranch; >- } >- } >+ $item_info->{holding_branch} = $item->effective_holdingbranch >+ if ( C4::Context->preference('UseDisplayModule') && $item->effective_holdingbranch ); > > if ($itemLevelTypes) { > my $itemtype = $item->itemtype; >-- >2.50.1 (Apple Git-155) >
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 14962
:
190216
|
190217
|
190218
|
190219
|
190220
|
190221
|
190222
|
190223
|
190224
|
190225
|
190226
|
190227
|
190228
|
190229
|
190230
|
190231
|
190232
|
190571
|
190572
|
193719
|
193720
|
193721
|
193722
|
193723
|
193724
|
193725
|
193726
|
193727
|
193728
|
193729
|
193730
|
193731
|
193732
|
193733
|
193734
|
193735
|
193736
|
193737
|
193738
|
193739
|
193740
|
193741
|
193742
|
193743
|
193744
|
193745
|
193746
|
193747
|
193748
|
193749
|
193750
|
193751
|
193752
|
193753
|
193754
|
193755
|
194285
|
194286
|
194287
|
194288
|
194289
|
194290
|
194291
|
194292
|
194293
|
194294
|
194295
|
194296
|
194297
|
194298
|
194299
|
194300
|
194301
|
194302
|
194303
|
194304
|
194305
|
194306
|
194307
|
194308
|
194309
|
194310
|
194311
|
194312
|
194313
|
194314
|
194315
|
194316
|
194317
|
194318
|
194320
|
194321
|
194322
|
194786
|
194795
|
194796
|
194797
|
194798
|
194799
|
194800
|
194801
|
194802
|
194803
|
194804
|
194805
|
194806
|
194807
|
194808
|
194809
|
194813
|
194814
|
194815
|
194816
|
194817
|
194818
|
194819
|
194820
|
194821
|
194822
|
194823
|
194824
|
194825
|
194826
|
194827
|
194828
|
194829
|
194830
|
194831
|
194832
|
194833
|
194834
|
194835
|
194836
|
194837
|
194838
|
194839
|
194840
|
194841
|
194842
|
194843
|
194844
|
194845
|
194846
|
194847
|
194848
|
194849
|
194850
|
194851
|
194852
|
194853
|
194854
|
194855
|
194856
|
194857
|
194858
|
194859
|
194860
|
194861
|
194862
|
194863
|
194864