Owen Leonard
63d7386ed0
The JavaScript included in cat-toolbar.inc expects several variables to be passed to the template for use in calculations. Several scripts do not pass the required variables to the template, leading to a JS error. This patch re-adds (See Bug 9823) hold count calculation to the required scripts and copies the acquisitions-related count calculation from detail.pl into related bibliographic detail scripts so that the commonly-included cat-toolbar.inc can receive correct values. To test, locate a bibliographic record which has no holds and is not used in a current or deleted order, but which has a local cover image attached. Check the following views to confirm there is no JavaScript error: - Normal - MARC - Labeled MARC - ISBD - Items - Images (from the Images tab on the "Normal" detail page) Next, locate a bibliographic record with no items attached which is used in an Acquisitions order. On each of the pages listed above, choose "Delete record" from the Edit menu. This should trigger a warning that the record is used in an order. Cancel the deletion. Finally, delete the order which references the bibliographic record. On each of the pages listed above, choose "Delete record" again. This should trigger a warning that the record is used in a deleted order. Cancel the deletion. I went through the test plan, everything works OK. It resolves Bug 11831 as well. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> - Printing from MARC and ISBD view works again - No more Javascript errors found - Deleting a record with attached order gives the correct warning, both for ordered and cancelled. Passes all tests and QA script. Signed-off-by: Galen Charlton <gmc@esilibrary.com>
114 lines
3.9 KiB
Perl
Executable file
114 lines
3.9 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2011 C & P Bibliography Services
|
|
#
|
|
# 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 2 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, write to the Free Software Foundation, Inc.,
|
|
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
use CGI;
|
|
use C4::Auth;
|
|
use C4::Biblio;
|
|
use C4::Items;
|
|
use C4::Output;
|
|
use C4::Images;
|
|
use C4::Search;
|
|
use C4::Acquisition qw(GetOrdersByBiblionumber);
|
|
|
|
my $query = new CGI;
|
|
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "catalogue/imageviewer.tmpl",
|
|
query => $query,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { catalogue => 1 },
|
|
}
|
|
);
|
|
|
|
my $biblionumber = $query->param('biblionumber') || $query->param('bib');
|
|
my $imagenumber = $query->param('imagenumber');
|
|
my $biblio = GetBiblio($biblionumber);
|
|
my $itemcount = GetItemsCount($biblionumber);
|
|
|
|
my @items = GetItemsInfo($biblionumber);
|
|
|
|
my $norequests = 1;
|
|
foreach my $item (@items) {
|
|
|
|
# can place holds defaults to yes
|
|
$norequests = 0
|
|
unless ( ( $item->{'notforloan_per_itemtype'} > 0 )
|
|
|| ( $item->{'itemnotforloan'} > 0 ) );
|
|
}
|
|
|
|
if ( $query->cookie("holdfor") ) {
|
|
my $holdfor_patron =
|
|
GetMember( 'borrowernumber' => $query->cookie("holdfor") );
|
|
$template->param(
|
|
holdfor => $query->cookie("holdfor"),
|
|
holdfor_surname => $holdfor_patron->{'surname'},
|
|
holdfor_firstname => $holdfor_patron->{'firstname'},
|
|
holdfor_cardnumber => $holdfor_patron->{'cardnumber'},
|
|
);
|
|
}
|
|
|
|
if ( C4::Context->preference("LocalCoverImages") ) {
|
|
my @images = ListImagesForBiblio($biblionumber);
|
|
$template->{VARS}->{'LocalCoverImages'} = 1;
|
|
$template->{VARS}->{'images'} = \@images;
|
|
$template->{VARS}->{'imagenumber'} = $imagenumber || $images[0] || '';
|
|
}
|
|
$template->{VARS}->{'count'} = $itemcount;
|
|
$template->{VARS}->{'biblionumber'} = $biblionumber;
|
|
$template->{VARS}->{'norequests'} = $norequests;
|
|
$template->param(C4::Search::enabled_staff_search_views);
|
|
$template->{VARS}->{'biblio'} = $biblio;
|
|
|
|
my @allorders_using_biblio = GetOrdersByBiblionumber ($biblionumber);
|
|
my @deletedorders_using_biblio;
|
|
my @orders_using_biblio;
|
|
my @baskets_orders;
|
|
my @baskets_deletedorders;
|
|
|
|
foreach my $myorder (@allorders_using_biblio) {
|
|
my $basket = $myorder->{'basketno'};
|
|
if ((defined $myorder->{'datecancellationprinted'}) and ($myorder->{'datecancellationprinted'} ne '0000-00-00') ){
|
|
push @deletedorders_using_biblio, $myorder;
|
|
unless (grep(/^$basket$/, @baskets_deletedorders)){
|
|
push @baskets_deletedorders,$myorder->{'basketno'};
|
|
}
|
|
}
|
|
else {
|
|
push @orders_using_biblio, $myorder;
|
|
unless (grep(/^$basket$/, @baskets_orders)){
|
|
push @baskets_orders,$myorder->{'basketno'};
|
|
}
|
|
}
|
|
}
|
|
|
|
my $count_orders_using_biblio = scalar @orders_using_biblio ;
|
|
$template->param (countorders => $count_orders_using_biblio);
|
|
|
|
my $count_deletedorders_using_biblio = scalar @deletedorders_using_biblio ;
|
|
$template->param (countdeletedorders => $count_deletedorders_using_biblio);
|
|
|
|
my $holds= C4::Reserves::GetReservesFromBiblionumber({ biblionumber => $biblionumber, all_dates => 1 });
|
|
my $holdcount = scalar( @$holds );
|
|
$template->param( holdcount => scalar ( @$holds ) );
|
|
|
|
output_html_with_http_headers $query, $cookie, $template->output;
|