From e5bf92bfec7091047d3ac60e3e3cfc785f706066 Mon Sep 17 00:00:00 2001 From: Alex Arnaud Date: Wed, 28 Oct 2015 15:49:28 +0100 Subject: [PATCH] [SIGNED-OFF] Bug 5979 - OPAC ISBD view has its own syspref Signed-off-by: Bernardo Gonzalez Kriegel Works well, empty OPACISBD removes link. Test pass. Small koha-qa error fixed in followup --- C4/Biblio.pm | 3 ++- t/Biblio/Isbd.t | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 t/Biblio/Isbd.t diff --git a/C4/Biblio.pm b/C4/Biblio.pm index 2e8827a..eef2323 100644 --- a/C4/Biblio.pm +++ b/C4/Biblio.pm @@ -923,12 +923,13 @@ Return the ISBD view which can be included in opac and intranet sub GetISBDView { my ( $biblionumber, $template ) = @_; my $record = GetMarcBiblio($biblionumber, 1); + my $sysprefname = $template eq 'opac' ? 'opacisbd' : 'isbd'; return unless defined $record; my $itemtype = &GetFrameworkCode($biblionumber); my ( $holdingbrtagf, $holdingbrtagsubf ) = &GetMarcFromKohaField( "items.holdingbranch", $itemtype ); my $tagslib = &GetMarcStructure( 1, $itemtype ); - my $ISBD = C4::Context->preference('isbd'); + my $ISBD = C4::Context->preference($sysprefname); my $bloc = $ISBD; my $res; my $blocres; diff --git a/t/Biblio/Isbd.t b/t/Biblio/Isbd.t new file mode 100644 index 0000000..7aeb31b --- /dev/null +++ b/t/Biblio/Isbd.t @@ -0,0 +1,50 @@ +#!/usr/bin/perl + +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . + +use Modern::Perl; + +use Test::More tests => 3; +use Test::MockModule; +use MARC::Record; +use t::lib::Mocks qw( mock_preference ); + +BEGIN { + use_ok('C4::Biblio'); +} + +my $dbh = C4::Context->dbh; +# Start transaction +$dbh->{AutoCommit} = 0; +$dbh->{RaiseError} = 1; + +my $template = '#200|

Title : |{200a}{ by 200f}|

'; +my $opac_template = '#200|

Title : |{200a}{ (200f)}|

'; +t::lib::Mocks::mock_preference('isbd', $template); +t::lib::Mocks::mock_preference('opacisbd', $opac_template); + +my $record = MARC::Record->new(); +$record->append_fields( + MARC::Field->new('200', '', '', 'a' => 'Montains'), + MARC::Field->new('200', '', '', 'f' => 'Keith Lye'), +); +my ($bibnum, $title, $bibitemnum) = AddBiblio($record, ''); + +my $isbd = GetISBDView($bibnum); +is($isbd, '

Title : Montains by Keith Lye

', 'ISBD is correct'); + +my $opacisbd = GetISBDView($bibnum, 'opac'); +is($opacisbd, '

Title : Montains (Keith Lye)

', 'OPAC ISBD is correct'); -- 1.9.1