Jonathan Druart
653d305452
iIf a patron is renewed from the circulation module, the librarian should be redirected to the circulation module. This works correctly if the renew is done from the patron module (members). This is caused by a typo in the template: desintation vs destination. This patch also removes the cardnumber parameter to the setstatus.pl script, it is not needed given that borrowernumber is always passed. This has a good side-effect, it will fix bug 14691. The cardnumber does not exist anymore, so no need to escape it :) Test plan: 0/ Do not apply this patch 1/ Create a patron with a cardnumber with a quote (rm'me) and another one without a quote (rmme) 2/ Go on the checkouts page (circ/circulation.pl) 3/ Renew the 2 patrons => With rm'me you are redirected to the circ module - ok => With rmme you are redirected to the member module - nok 4/ Go on the patron detail page (members/moremember.pl) 5/ Renew the 2 patrons => you are redirected to the member module - ok 6/ Delete the patrons => Nothing happend with rm'me, there is a JS error on the page - nok => rmme is deleted - ok 7/ Apply the patch and recreate rmme 8/ Repeat 2, 3, 4, 5 => You are redirected to the correct module 9/ Delete the patrons => They are successfully deleted Signed-off-by: Magnus Enger <magnus@libriotech.no> Followed the test plan, works as advertised. (I did have some problems initially, but that was caused by me not using the interface in English...) Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
68 lines
2.1 KiB
Perl
Executable file
68 lines
2.1 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
#script to set or lift debarred status
|
|
#written 2/8/04
|
|
#by oleonard@athenscounty.lib.oh.us
|
|
|
|
|
|
# Copyright 2000-2002 Katipo Communications
|
|
# Parts copyright 2010 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 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::Context;
|
|
use C4::Members;
|
|
use C4::Auth;
|
|
|
|
|
|
my $input = new CGI;
|
|
|
|
checkauth($input, 0, { borrowers => 1 }, 'intranet');
|
|
|
|
my $destination = $input->param("destination") || '';
|
|
my $borrowernumber=$input->param('borrowernumber');
|
|
my $status = $input->param('status');
|
|
my $reregistration = $input->param('reregistration') || '';
|
|
|
|
my $dbh = C4::Context->dbh;
|
|
my $dateexpiry;
|
|
|
|
if ( $reregistration eq 'y' ) {
|
|
# re-reregistration function to automatic calcul of date expiry
|
|
$dateexpiry = ExtendMemberSubscriptionTo( $borrowernumber );
|
|
} else {
|
|
my $sth = $dbh->prepare("UPDATE borrowers SET debarred = ?, debarredcomment = '' WHERE borrowernumber = ?");
|
|
$sth->execute( $status, $borrowernumber );
|
|
$sth->finish;
|
|
}
|
|
|
|
if($destination eq "circ"){
|
|
if($dateexpiry){
|
|
print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber&was_renewed=1");
|
|
} else {
|
|
print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber");
|
|
}
|
|
} else {
|
|
if($dateexpiry){
|
|
print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber&was_renewed=1");
|
|
} else {
|
|
print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
|
|
}
|
|
}
|