From e8e5b194505aa47213a22cd6f6dff41087f4ea5e Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 28 Sep 2015 10:58:16 +0100 Subject: [PATCH] [Signed-off] Bug 14910: Redirect to the circulation module after a renew MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Followed test plan, works as expected. Signed-off-by: Marc VĂ©ron --- .../prog/en/includes/members-toolbar.inc | 4 ++-- .../prog/en/modules/circ/circulation.tt | 4 ++-- members/setstatus.pl | 21 ++++++++++---------- 3 files changed, 14 insertions(+), 15 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 70edbc0..318f690 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() { @@ -161,7 +161,7 @@ function searchToHold(){