From 0d239e4e6f3c7095173773252dc9ce38b48c0799 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Mon, 20 Mar 2017 07:22:41 -0400
Subject: [PATCH] Bug 18264 - (QA Followup) Remove use of
 GetBiblioFromItemNumber Replace <blank> with (blank)

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
---
 course_reserves/add_items.pl                               | 7 +++++--
 .../prog/en/modules/course_reserves/add_items-step2.tt     | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/course_reserves/add_items.pl b/course_reserves/add_items.pl
index ef8605f89d..fc705e1928 100755
--- a/course_reserves/add_items.pl
+++ b/course_reserves/add_items.pl
@@ -26,6 +26,7 @@ use C4::Auth;
 use C4::Output;
 use C4::Koha;
 use C4::Biblio;
+use Koha::Items;
 
 use C4::CourseReserves qw(GetCourse GetCourseItem GetCourseReserve ModCourseItem ModCourseReserve);
 
@@ -37,7 +38,8 @@ my $barcode      = $cgi->param('barcode')      || '';
 my $return       = $cgi->param('return')       || '';
 my $itemnumber   = ($cgi->param('itemnumber') && $action eq 'lookup') ? $cgi->param('itemnumber') : '';
 
-my $item = GetBiblioFromItemNumber( $itemnumber, $barcode );
+my $item = Koha::Items->find( { ( $itemnumber ? ( itemnumber => $itemnumber ) : ( barcode => $barcode ) ) } );
+my $title = ($item) ? $item->biblio->title : undef;
 
 my $step = ( $action eq 'lookup' && $item ) ? '2' : '1';
 
@@ -50,7 +52,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         flagsrequired   => { coursereserves => 'add_reserves' },
     }
 );
-my $inumber = $itemnumber ? "<blank> (itemnumber:$itemnumber)" : "";
+my $inumber = $itemnumber ? "(blank) (itemnumber:$itemnumber)" : "";
 $template->param( ERROR_BARCODE_NOT_FOUND => $barcode . $inumber )
   unless ( $barcode && !$itemnumber && $item && $action eq 'lookup' );
 
@@ -68,6 +70,7 @@ if ( $action eq 'lookup' ) {
 
     $template->param(
         item           => $item,
+        title          => $title,
         course_item    => $course_item,
         course_reserve => $course_reserve,
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt
index 3286640e06..bc5831a7ec 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt
@@ -9,7 +9,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> &rsaquo; Reserve <i><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblionumber %]">[% item.title %]</a></i> for <i><a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id %]">[% course.course_name %]</a></i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> &rsaquo; Reserve <i><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblionumber %]">[% title %]</a></i> for <i><a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id %]">[% course.course_name %]</a></i></div>
 
 <div id="doc" class="yui-t7">
     <div id="bd">
@@ -23,7 +23,7 @@
             <input type="hidden" name="action" value="add" />
 
             <fieldset class="rows">
-                <legend>Add <i>[% item.title %]</i> to <i>[% course.course_name %]</i></legend>
+                <legend>Add <i>[% title %]</i> to <i>[% course.course_name %]</i></legend>
                 <ol>
                     <li>
                         <span class="label">Barcode:</span>
-- 
2.39.5