From 409b305b5594f2a2d7d676d36f7a13aab541105c Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 4 Jan 2017 10:32:26 +0100 Subject: [PATCH] Bug 17843: Remove C4::Koha::getitemtypeinfo At this point there should not be any calls to this subroutine. --- C4/Koha.pm | 40 ---------------------------------------- t/db_dependent/Koha.t | 8 +------- 2 files changed, 1 insertion(+), 47 deletions(-) diff --git a/C4/Koha.pm b/C4/Koha.pm index af5a2f2..3d31a3f 100644 --- a/C4/Koha.pm +++ b/C4/Koha.pm @@ -41,7 +41,6 @@ BEGIN { @ISA = qw(Exporter); @EXPORT = qw( &GetPrinters &GetPrinter - &getitemtypeinfo &GetItemTypesCategorized &getallthemes &getFacets @@ -123,45 +122,6 @@ sub GetItemTypesCategorized { return ($dbh->selectall_hashref($query,'itemtype')); } -=head2 getitemtypeinfo - - $itemtype = &getitemtypeinfo($itemtype, [$interface]); - -Returns information about an itemtype. The optional $interface argument -sets which interface ('opac' or 'intranet') to return the imageurl for. -Defaults to intranet. - -=cut - -sub getitemtypeinfo { - my ($itemtype, $interface) = @_; - my $dbh = C4::Context->dbh; - require C4::Languages; - my $language = C4::Languages::getlanguage(); - my $it = $dbh->selectrow_hashref(q| - SELECT - itemtypes.itemtype, - itemtypes.description, - itemtypes.rentalcharge, - itemtypes.notforloan, - itemtypes.imageurl, - itemtypes.summary, - itemtypes.checkinmsg, - itemtypes.checkinmsgtype, - itemtypes.sip_media_type, - COALESCE( localization.translation, itemtypes.description ) AS translated_description - FROM itemtypes - LEFT JOIN localization ON itemtypes.itemtype = localization.code - AND localization.entity = 'itemtypes' - AND localization.lang = ? - WHERE itemtypes.itemtype = ? - |, undef, $language, $itemtype ); - - $it->{imageurl} = getitemtypeimagelocation( ( ( defined $interface && $interface eq 'opac' ) ? 'opac' : 'intranet' ), $it->{imageurl} ); - - return $it; -} - =head2 getitemtypeimagedir my $directory = getitemtypeimagedir( 'opac' ); diff --git a/t/db_dependent/Koha.t b/t/db_dependent/Koha.t index b3f51e0..635f57c 100644 --- a/t/db_dependent/Koha.t +++ b/t/db_dependent/Koha.t @@ -9,7 +9,7 @@ use Koha::DateUtils qw(dt_from_string); use Koha::AuthorisedValue; use Koha::AuthorisedValueCategories; -use Test::More tests => 7; +use Test::More tests => 6; use DateTime::Format::MySQL; BEGIN { @@ -151,12 +151,6 @@ subtest 'Authorized Values Tests' => sub { }; -subtest 'Itemtype info Tests' => sub { - like ( getitemtypeinfo('BK')->{'imageurl'}, qr/intranet-tmpl/, 'getitemtypeinfo on unspecified interface returns intranet imageurl (legacy behavior)' ); - like ( getitemtypeinfo('BK', 'intranet')->{'imageurl'}, qr/intranet-tmpl/, 'getitemtypeinfo on "intranet" interface returns intranet imageurl' ); - like ( getitemtypeinfo('BK', 'opac')->{'imageurl'}, qr/opac-tmpl/, 'getitemtypeinfo on "opac" interface returns opac imageurl' ); -}; - ### test for C4::Koha->GetDailyQuote() SKIP: { -- 2.1.4