@@ -, +, @@ --- C4/CourseReserves.pm | 8 ++++++-- course_reserves/add_items.pl | 9 ++++++--- .../prog/en/modules/course_reserves/add_items-step2.tt | 4 ++-- .../prog/en/modules/course_reserves/course-details.tt | 12 ++++++------ .../opac-tmpl/bootstrap/en/modules/opac-course-details.tt | 6 +++--- 5 files changed, 23 insertions(+), 16 deletions(-) --- a/C4/CourseReserves.pm +++ a/C4/CourseReserves.pm @@ -21,7 +21,6 @@ use List::MoreUtils qw(any); use C4::Context; use C4::Items qw(GetItem ModItem); -use C4::Biblio qw(GetBiblioFromItemNumber); use C4::Circulation qw(GetOpenIssue); use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $DEBUG @FIELDS); @@ -877,8 +876,13 @@ sub GetCourseReserves { if ($include_items) { foreach my $cr (@$course_reserves) { + my $item = Koha::Items->find( $cr->{itemnumber} ); + my $biblio = $item->biblio; + my $biblioitem = $biblio->biblioitem; $cr->{'course_item'} = GetCourseItem( ci_id => $cr->{'ci_id'} ); - $cr->{'item'} = GetBiblioFromItemNumber( $cr->{'itemnumber'} ); + $cr->{'item'} = $item; + $cr->{'biblio'} = $biblio; + $cr->{'biblioitem'} = $biblioitem; $cr->{'issue'} = GetOpenIssue( $cr->{'itemnumber'} ); } } --- a/course_reserves/add_items.pl +++ a/course_reserves/add_items.pl @@ -29,6 +29,8 @@ use C4::Biblio; use C4::CourseReserves qw(GetCourse GetCourseItem GetCourseReserve ModCourseItem ModCourseReserve); +use Koha::Items; + my $cgi = new CGI; my $action = $cgi->param('action') || ''; @@ -36,7 +38,7 @@ my $course_id = $cgi->param('course_id') || ''; my $barcode = $cgi->param('barcode') || ''; my $return = $cgi->param('return') || ''; -my $item = GetBiblioFromItemNumber( undef, $barcode ); +my $item = Koha::Items->find({ barcode => $barcode }); my $step = ( $action eq 'lookup' && $item ) ? '2' : '1'; @@ -54,8 +56,8 @@ $template->param( ERROR_BARCODE_NOT_FOUND => $barcode ) $template->param( course => GetCourse($course_id) ); -if ( $action eq 'lookup' ) { - my $course_item = GetCourseItem( itemnumber => $item->{'itemnumber'} ); +if ( $action eq 'lookup' and $item ) { + my $course_item = GetCourseItem( itemnumber => $item->itemnumber ); my $course_reserve = ($course_item) ? GetCourseReserve( @@ -66,6 +68,7 @@ if ( $action eq 'lookup' ) { $template->param( item => $item, + biblio => $item->biblio, course_item => $course_item, course_reserve => $course_reserve, --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt @@ -9,7 +9,7 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - +
@@ -23,7 +23,7 @@
- Add [% item.title %] to [% course.course_name %] + Add [% biblio.title %] to [% course.course_name %]
  1. Barcode: --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt @@ -102,9 +102,9 @@ [% FOREACH cr IN course_reserves %] - [% cr.item.title %] - [% cr.item.author %] - [% cr.item.barcode %] + [% cr.biblio.title %] + [% cr.biblio.author %] + [% cr.item.barcode %] [% cr.item.itemcallnumber %] [% IF item_level_itypes %] @@ -125,14 +125,14 @@ [% IF cr.course_item.ccode %] [% IF cr.course_item.enabled == 'yes' %] - [% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %] + [% AuthorisedValues.GetByCode( 'CCODE', cr.biblioitem.ccode ) %] [% ELSE %] [% AuthorisedValues.GetByCode( 'CCODE', cr.course_item.ccode ) %] [% END %] [% ELSE %] Unchanged - [% IF cr.item.ccode %] - ([% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %]) + [% IF cr.biblioitem.ccode %] + ([% AuthorisedValues.GetByCode( 'CCODE', cr.biblioitem.ccode ) %]) [% END %] [% END %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt @@ -66,11 +66,11 @@ [% FOREACH cr IN course_reserves %] - [% cr.item.title %] - [% cr.item.author %] + [% cr.biblio.title %] + [% cr.biblio.author %] [% ItemTypes.GetDescription( cr.item.itype ) %] [% Branches.GetName( cr.item.holdingbranch ) %]
    [% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) %] - [% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %] + [% AuthorisedValues.GetByCode( 'CCODE', cr.biblioitem.ccode ) %] [% cr.item.itemcallnumber %] [% cr.item.copynumber %] [% INCLUDE 'item-status.inc' item=cr.item issue=cr.issue %] --