fd14184873
This patch sets $limit to be an empty string. Test plan ========= 1/ login into the opac using your user account credentials 2/ in a terminal, run a `tail -f ` on your instance's opac-error.log 3/ go back to the opac, click on 'your reading history' tab to go to opac-readingrecord.pl 4/ notice the warning - "opac-readingrecord.pl: Use of uninitialized value $limit" appear in the `tail`ed opac-error.log 5/ apply the patch 6/ reload the page (opac-readingrecord.pl) 7/ page works but the warning in step #4 is no longer logged 8/ run qa test (i.e. koha-qa.pl -c 1 -v 2), there should be no error Remarks: Testing result match expected test plan output. The QA tests pass with "OK" for the commit. Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg@gmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
154 lines
4.5 KiB
Perl
Executable file
154 lines
4.5 KiB
Perl
Executable file
#!/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 <http://www.gnu.org/licenses>.
|
|
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
use CGI qw ( -utf8 );
|
|
|
|
use C4::Auth;
|
|
use C4::Koha;
|
|
use C4::Biblio;
|
|
use C4::Circulation;
|
|
use C4::Members;
|
|
use Koha::DateUtils;
|
|
use MARC::Record;
|
|
|
|
use C4::Output;
|
|
use C4::Charset qw(StripNonXmlChars);
|
|
|
|
my $query = new CGI;
|
|
|
|
# if opacreadinghistory is disabled, leave immediately
|
|
if ( ! C4::Context->preference('opacreadinghistory') ) {
|
|
print $query->redirect("/cgi-bin/koha/errors/404.pl");
|
|
exit;
|
|
}
|
|
|
|
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "opac-readingrecord.tt",
|
|
query => $query,
|
|
type => "opac",
|
|
authnotrequired => 0,
|
|
flagsrequired => { borrow => 1 },
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
# get borrower information ....
|
|
my ( $borr ) = GetMemberDetails( $borrowernumber );
|
|
|
|
$template->param(%{$borr});
|
|
|
|
my $itemtypes = GetItemTypes();
|
|
|
|
# get the record
|
|
my $order = $query->param('order') || '';
|
|
if ( $order eq 'title' ) {
|
|
$template->param( orderbytitle => 1 );
|
|
}
|
|
elsif ( $order eq 'author' ) {
|
|
$template->param( orderbyauthor => 1 );
|
|
}
|
|
else {
|
|
$order = "date_due desc";
|
|
$template->param( orderbydate => 1 );
|
|
}
|
|
|
|
|
|
my $limit = $query->param('limit');
|
|
$limit //= '';
|
|
$limit = ( $limit eq 'full' ) ? 0 : 50;
|
|
|
|
my $issues = GetAllIssues( $borrowernumber, $order, $limit );
|
|
|
|
my $itype_attribute =
|
|
( C4::Context->preference('item-level_itypes') ) ? 'itype' : 'itemtype';
|
|
|
|
my $opac_summary_html = C4::Context->preference('OPACMySummaryHTML');
|
|
foreach my $issue ( @{$issues} ) {
|
|
$issue->{normalized_isbn} = GetNormalizedISBN( $issue->{isbn} );
|
|
if ( $issue->{$itype_attribute} ) {
|
|
$issue->{description} =
|
|
$itemtypes->{ $issue->{$itype_attribute} }->{description};
|
|
$issue->{imageurl} =
|
|
getitemtypeimagelocation( 'opac',
|
|
$itemtypes->{ $issue->{$itype_attribute} }->{imageurl} );
|
|
}
|
|
if ( $issue->{marcxml} ) {
|
|
my $marcxml = StripNonXmlChars( $issue->{marcxml} );
|
|
my $marc_rec =
|
|
MARC::Record::new_from_xml( $marcxml, 'utf8',
|
|
C4::Context->preference('marcflavour') );
|
|
$issue->{subtitle} =
|
|
GetRecordValue( 'subtitle', $marc_rec, $issue->{frameworkcode} );
|
|
}
|
|
# My Summary HTML
|
|
if ($opac_summary_html) {
|
|
my $my_summary_html = $opac_summary_html;
|
|
$issue->{author}
|
|
? $my_summary_html =~ s/{AUTHOR}/$issue->{author}/g
|
|
: $my_summary_html =~ s/{AUTHOR}//g;
|
|
my $title = $issue->{title};
|
|
$title =~ s/\/+$//; # remove trailing slash
|
|
$title =~ s/\s+$//; # remove trailing space
|
|
$title
|
|
? $my_summary_html =~ s/{TITLE}/$title/g
|
|
: $my_summary_html =~ s/{TITLE}//g;
|
|
$issue->{normalized_isbn}
|
|
? $my_summary_html =~ s/{ISBN}/$issue->{normalized_isbn}/g
|
|
: $my_summary_html =~ s/{ISBN}//g;
|
|
$issue->{biblionumber}
|
|
? $my_summary_html =~ s/{BIBLIONUMBER}/$issue->{biblionumber}/g
|
|
: $my_summary_html =~ s/{BIBLIONUMBER}//g;
|
|
$issue->{MySummaryHTML} = $my_summary_html;
|
|
}
|
|
}
|
|
|
|
if (C4::Context->preference('BakerTaylorEnabled')) {
|
|
$template->param(
|
|
JacketImages=>1,
|
|
BakerTaylorEnabled => 1,
|
|
BakerTaylorImageURL => &image_url(),
|
|
BakerTaylorLinkURL => &link_url(),
|
|
BakerTaylorBookstoreURL => C4::Context->preference('BakerTaylorBookstoreURL'),
|
|
);
|
|
}
|
|
|
|
BEGIN {
|
|
if (C4::Context->preference('BakerTaylorEnabled')) {
|
|
require C4::External::BakerTaylor;
|
|
import C4::External::BakerTaylor qw(&image_url &link_url);
|
|
}
|
|
}
|
|
|
|
for(qw(AmazonCoverImages GoogleJackets)) { # BakerTaylorEnabled handled above
|
|
C4::Context->preference($_) or next;
|
|
$template->param($_=>1);
|
|
$template->param(JacketImages=>1);
|
|
}
|
|
|
|
$template->param(
|
|
READING_RECORD => $issues,
|
|
limit => $limit,
|
|
readingrecview => 1,
|
|
OPACMySummaryHTML => $opac_summary_html ? 1 : 0,
|
|
);
|
|
|
|
output_html_with_http_headers $query, $cookie, $template->output;
|