From c65b97a16c34ed937b3f1313660882a6735c4b27 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 16 Jul 2019 18:05:23 +0000 Subject: [PATCH] Bug 23145: Confirming transfer during checkin clears the table of previously checked-in items This patch corrects the checkin template so that checking in an item with an existing transfer does not clear the page of previous checkouts. To test, apply the patch and check in some items. - After each checkin the returned item should appear in the table of checkouts. - Check in an item which belongs to another branch. You will be asked to confirm that the items requires a transfer. When the page reloads you should see the same previous checkins in the table. - Check in that same item again. You will be again asked to confirm. Before this page, confirming the transfer would reload the page and clear the list of checkins. Now the page should reload and the table of checkins should still show the previously checked-in items. Test all the actions when checking in an item which is already in transit: OK, Print transfer slip, and Cancel transfer. Signed-off-by: George Williams Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize (cherry picked from commit 3cfd78788fe1bda05894a08c22f69ce1baa9482c) Signed-off-by: Fridolin Somers (cherry picked from commit 44cd65d3ee688f24a077d51214bfa670a2cc5deb) --- .../prog/en/modules/circ/returns.tt | 63 ++++++++++++------- 1 file changed, 41 insertions(+), 22 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index f32bf1af78..2159a76e06 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -204,27 +204,51 @@ @@ -925,11 +949,6 @@ this.form.submit(); }); - $('.cancel-transfer').on("click",function(e){ - e.preventDefault(); - window.location.href='/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber | html %]&canceltransfer=1' - }); - $('.action').on("click",function(e){ this.checked = false; this.form.return_date_override.value = ''; -- 2.39.5