Owen Leonard
e185aaf19b
This patch changes the OPAC list download process so that the download link triggers a modal dialog instead of a pop-up window. This streamlines the process a little bit and makes it work better on mobile devices. The download list page has been altered so that it works better as a standalone page, as it might be seen if JavaScript is disabled. Simple form validation has been added to help prevent submission of the form without choosing a format. To test the virtualshelves system preference must be enabled. - View an existing list in the OPAC and click the "download list" link. - A modal dialog should be displayed with the download form. - Submitting the form without selecting a format should trigger either a browser-based form validation error (in HTML5-supporting browsers) or a JavaScript alert (if your browser doesn't support the "required" attribute. - Choosing a download format and submitting the form should close the dialog and trigger the correct download. - Clicking the "Cancel" link should close the dialog. Test with JavaScript disabled: - Clicking the "download list" link should take you to a page which contains the same form which appeared in the modal dialog. - Submitting the form without selecting a format should trigger either a browser-based form validation error (in HTML5-supporting browsers) or a JavaScript alert (if your browser doesn't support the "required" attribute.. - Choosing a download format and submitting the form should result in the corect download. - Clicking the "Cancel" link should return you to the correct list. Signed-off-by: Aleisha <aleishaamohia@hotmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Passes QA script and tests, works as described. Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
123 lines
3.8 KiB
Perl
Executable file
123 lines
3.8 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2009 BibLibre
|
|
#
|
|
# 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 Encode qw(encode);
|
|
|
|
use C4::Auth;
|
|
use C4::Biblio;
|
|
use C4::Items;
|
|
use C4::Output;
|
|
use C4::VirtualShelves;
|
|
use C4::Record;
|
|
use C4::Ris;
|
|
use C4::Csv;
|
|
use utf8;
|
|
my $query = new CGI;
|
|
|
|
my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
|
|
{
|
|
template_name => "opac-downloadshelf.tt",
|
|
query => $query,
|
|
type => "opac",
|
|
authnotrequired => 1,
|
|
flagsrequired => { borrow => 1 },
|
|
}
|
|
);
|
|
|
|
my $shelfid = $query->param('shelfid');
|
|
my $format = $query->param('format');
|
|
my $context = $query->param('context');
|
|
my $showprivateshelves = $query->param('showprivateshelves');
|
|
my $dbh = C4::Context->dbh;
|
|
|
|
if ( ShelfPossibleAction( (defined($borrowernumber) ? $borrowernumber : -1), $shelfid, 'view' ) ) {
|
|
|
|
if ($shelfid && $format) {
|
|
|
|
my ($items, $totitems) = GetShelfContents($shelfid);
|
|
my $marcflavour = C4::Context->preference('marcflavour');
|
|
my $output;
|
|
|
|
# CSV
|
|
if ($format =~ /^\d+$/) {
|
|
my @biblios;
|
|
foreach (@$items) {
|
|
push @biblios, $_->{biblionumber};
|
|
}
|
|
$output = marc2csv(\@biblios, $format);
|
|
|
|
# Other formats
|
|
} else {
|
|
foreach my $biblio (@$items) {
|
|
my $biblionumber = $biblio->{biblionumber};
|
|
|
|
my $record = GetMarcBiblio($biblionumber, 1);
|
|
next unless $record;
|
|
|
|
if ($format eq 'iso2709') {
|
|
$output .= $record->as_usmarc();
|
|
}
|
|
elsif ($format eq 'ris' ) {
|
|
$output .= marc2ris($record);
|
|
}
|
|
elsif ($format eq 'bibtex') {
|
|
$output .= marc2bibtex($record, $biblionumber);
|
|
}
|
|
}
|
|
}
|
|
|
|
# If it was a CSV export we change the format after the export so the file extension is fine
|
|
$format = "csv" if ($format =~ m/^\d+$/);
|
|
|
|
print $query->header(
|
|
-type => 'application/octet-stream',
|
|
-'Content-Transfer-Encoding' => 'binary',
|
|
-attachment=>"shelf.$format");
|
|
print $output;
|
|
|
|
} else {
|
|
|
|
# get details of the list
|
|
my ($shelfnumber,$shelfname,$owner,$category,$sorton) = GetShelf($shelfid);
|
|
|
|
# if modal context is passed set a variable so that page markup can be different
|
|
if($context eq "modal"){
|
|
$template->param(modal => 1);
|
|
} else {
|
|
$template->param(fullpage => 1);
|
|
}
|
|
$template->param(csv_profiles => GetCsvProfilesLoop('marc'));
|
|
$template->param(
|
|
showprivateshelves => $showprivateshelves,
|
|
shelfid => $shelfid,
|
|
shelfname => $shelfname,
|
|
shelfnumber => $shelfnumber,
|
|
viewshelf => $shelfnumber
|
|
);
|
|
output_html_with_http_headers $query, $cookie, $template->output;
|
|
}
|
|
|
|
} else {
|
|
$template->param(invalidlist => 1);
|
|
output_html_with_http_headers $query, $cookie, $template->output;
|
|
}
|