Owen Leonard
94b2b6c4f9
This patch fixes a problem with several patron-related pages, where the "Update child to adult patron" menu item doesn't work. With some pages, the right category information wasn't being passed from the script to the template. With some, the right JavaScript variable weren't being passed from the template to the included JavaScript file. To test, apply the patch locate some patrons with "child" type patron categories. With each patron, go to one of the following pages and test the "update child" process in the toolbar's "More" menu. - Circulation -> - Batch check out - Notices - Statistics - Files - Housebound - Delete (test from the deletion confirmation screen). All test should be performed on a system with multiple adult patron categories configured AND on a system with only a single adult patron category. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
137 lines
4.1 KiB
Perl
Executable file
137 lines
4.1 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2012 ByWater Solutions
|
|
#
|
|
# 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 Modern::Perl;
|
|
|
|
use CGI qw ( -utf8 );
|
|
|
|
use C4::Auth;
|
|
use C4::Output;
|
|
use C4::Members;
|
|
use C4::Members::Attributes qw(GetBorrowerAttributes);
|
|
use C4::Debug;
|
|
|
|
use Koha::DateUtils;
|
|
use Koha::Patrons;
|
|
use Koha::Patron::Files;
|
|
use Koha::Patron::Categories;
|
|
|
|
my $cgi = CGI->new;
|
|
|
|
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "members/files.tt",
|
|
query => $cgi,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { borrowers => 'edit_borrowers' },
|
|
debug => 1,
|
|
}
|
|
);
|
|
$template->param( 'borrower_files' => 1 );
|
|
|
|
my $borrowernumber = $cgi->param('borrowernumber');
|
|
|
|
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
|
my $patron = Koha::Patrons->find($borrowernumber);
|
|
output_and_exit_if_error( $cgi, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
|
|
|
|
my $bf = Koha::Patron::Files->new( borrowernumber => $borrowernumber ); # FIXME Should be $patron->get_files. Koha::Patron::Files needs to be Koha::Objects based first
|
|
|
|
my $op = $cgi->param('op') || '';
|
|
|
|
if ( $op eq 'download' ) {
|
|
my $file_id = $cgi->param('file_id');
|
|
my $file = $bf->GetFile( id => $file_id );
|
|
|
|
print $cgi->header(
|
|
-type => $file->{'file_type'},
|
|
-charset => 'utf-8',
|
|
-attachment => $file->{'file_name'}
|
|
);
|
|
print $file->{'file_content'};
|
|
}
|
|
else {
|
|
|
|
my $patron_category = $patron->category;
|
|
$template->param( patron => $patron );
|
|
|
|
my %errors;
|
|
|
|
if ( $op eq 'upload' ) {
|
|
my $uploaded_file = $cgi->upload('uploadfile');
|
|
|
|
if ($uploaded_file) {
|
|
my $filename = $cgi->param('uploadfile');
|
|
my $mimetype = $cgi->uploadInfo($filename)->{'Content-Type'};
|
|
|
|
$errors{'empty_upload'} = 1 if ( -z $uploaded_file );
|
|
|
|
if (%errors) {
|
|
$template->param( errors => %errors );
|
|
}
|
|
else {
|
|
my $file_content;
|
|
while (<$uploaded_file>) {
|
|
$file_content .= $_;
|
|
}
|
|
|
|
$bf->AddFile(
|
|
name => $filename,
|
|
type => $mimetype,
|
|
content => $file_content,
|
|
description => scalar $cgi->param('description'),
|
|
);
|
|
}
|
|
}
|
|
else {
|
|
$errors{'no_file'} = 1;
|
|
}
|
|
} elsif ( $op eq 'delete' ) {
|
|
$bf->DelFile( id => scalar $cgi->param('file_id') );
|
|
}
|
|
|
|
if (C4::Context->preference('ExtendedPatronAttributes')) {
|
|
my $attributes = GetBorrowerAttributes($borrowernumber);
|
|
$template->param(
|
|
ExtendedPatronAttributes => 1,
|
|
extendedattributes => $attributes
|
|
);
|
|
}
|
|
|
|
if ( $patron->is_child ) {
|
|
my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
|
|
$template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
|
|
$template->param( 'catcode' => $patron_categories->next->categorycode ) if $patron_categories->count == 1;
|
|
}
|
|
|
|
$template->param(
|
|
files => Koha::Patron::Files->new( borrowernumber => $borrowernumber )
|
|
->GetFilesInfo(),
|
|
|
|
errors => \%errors,
|
|
);
|
|
output_html_with_http_headers $cgi, $cookie, $template->output;
|
|
}
|
|
|
|
=head1 AUTHOR
|
|
|
|
Kyle M Hall <kyle@bywatersolutions.com>
|
|
|
|
=cut
|