From 62839fc4865ea7fd9a5ba48860bc46d0e463b6df Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 28 Sep 2015 10:58:16 +0100 Subject: [PATCH] Bug 14910: Redirect to the circulation module after a renew 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 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 Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 653d305452a27d19d929e2acff71643845686af3) Signed-off-by: Chris Cormack (cherry picked from commit dcd54915d0ce56acd900de313715be416ddc9c7e) Signed-off-by: Liz Rea --- .../prog/en/includes/members-toolbar.inc | 4 ++-- .../prog/en/modules/circ/circulation.tt | 4 ++-- members/setstatus.pl | 17 ++++++++--------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc index 828c564955..7a525207f9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -107,7 +107,7 @@ function update_child() { function confirm_reregistration() { var is_confirmed = window.confirm(_("Are you sure you want to renew this patron's registration?")); if (is_confirmed) { - window.location = '/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&cardnumber=[% cardnumber %]&desintation=[% destination %]&reregistration=y'; + window.location = '/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&destination=[% destination %]&reregistration=y'; } } function export_barcodes() { @@ -169,7 +169,7 @@ function searchToHold(){
    [% IF ( CAN_user_borrowers ) %] -
  • Renew patron
    • +
  • Renew patron
    • [% ELSE %]
  • Renew patron
    • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 725dfe07dc..0a986f4677 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -646,7 +646,7 @@ No patron matched [% message %] [% IF ( warndeparture ) %]
  • Expiration: Patron's card will expire soon. - Patron's card expires on [% expiry %] Renew or Edit Details + Patron's card expires on [% expiry %] Renew or Edit Details
    • [% END %] @@ -659,7 +659,7 @@ No patron matched [% message %] [% IF ( expired ) %]
  • Expiration: Patron's card has expired. - [% IF ( expiry ) %]Patron's card expired on [% expiry %][% END %] Renew or Edit Details + [% IF ( expiry ) %]Patron's card expired on [% expiry %][% END %] Renew or Edit Details
    • [% END %] diff --git a/members/setstatus.pl b/members/setstatus.pl index f1f0d696d3..41cf6194cd 100755 --- a/members/setstatus.pl +++ b/members/setstatus.pl @@ -37,7 +37,6 @@ my $input = new CGI; checkauth($input, 0, { borrowers => 1 }, 'intranet'); my $destination = $input->param("destination") || ''; -my $cardnumber = $input->param("cardnumber"); my $borrowernumber=$input->param('borrowernumber'); my $status = $input->param('status'); my $reregistration = $input->param('reregistration') || ''; @@ -55,15 +54,15 @@ if ( $reregistration eq 'y' ) { } if($destination eq "circ"){ - if($dateexpiry){ - print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber&was_renewed=1"); - } else { - print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber"); - } + 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){ + if($dateexpiry){ print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber&was_renewed=1"); - } else { + } else { print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber"); - } + } } -- 2.39.5