Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 18264 - (QA Followup) Remove use of GetBiblioFromItemNumber Replace <blank> with (blank)

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
This commit is contained in:
Nick Clemens 2017-03-20 07:22:41 -04:00 committed by Brendan A Gallagher
parent 2ead301181
commit 0d239e4e6f
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
course_reserves/add_items.pl
View file

@ -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,

4
koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt
View file

@ -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>