Attachment 6187 Details for Bug 7120 – Signed off patch (Proposed fix)

[patch] Signed off patch (Proposed fix)

0001-Fix-for-Bug-7120-After-deleting-order-from-order-rec.patch (text/plain), 3.42 KB, created by Julian Maurice on 2011-11-04 09:13:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2011-11-04 09:13:48 UTC

Size: 3.42 KB

patch

obsolete

>From 06856909f72538761bceb7be17ef819d52a85030 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Mon, 31 Oct 2011 11:01:35 -0400
>Subject: [PATCH] Fix for Bug 7120 - After deleting order from order receive
> page redirect fails
>
>The order modification script doesn't retrieve an order's basket
>when doing a delete, so the template must explicitly pass
>the basket number if we want the redirect to work.
>
>Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
>---
> .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>index 45eb591..eb5492e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>@@ -135,17 +135,17 @@
> </script>
> <script type="text/javascript">
> //<![CDATA[
>- function confirm_delete_item(ordernumber, biblionumber) {
>+ function confirm_delete_item(ordernumber, basketno, biblionumber) {
> var is_confirmed = confirm(_('Are you sure you want to delete this order ?'));
> if (is_confirmed) {
>- window.location = "addorder.pl?ordernumber="+ordernumber+"&basketno=[% basketno %]&quantity=0&biblionumber="+biblionumber;
>+ window.location = "addorder.pl?ordernumber="+ordernumber+"&basketno="+basketno+"&quantity=0&biblionumber="+biblionumber;
> }
> }
> 
> function confirm_delete_biblio(ordernumber, biblionumber) {
> var is_confirmed = confirm(_('Are you sure you want to delete this catalog record and order ?'));
> if (is_confirmed) {
>- window.location = "addorder.pl?ordernumber="+ordernumber+"&basketno=[% basketno %]&quantity=0&biblionumber="+biblionumber+"&delbiblio=1";
>+ window.location = "addorder.pl?ordernumber="+ordernumber+"&basketno="+basketno+"&quantity=0&biblionumber="+biblionumber+"&delbiblio=1";
> }
> }
> 
>@@ -254,10 +254,10 @@
> 				 [% IF ( loop_order.left_holds_on_order ) %]
> Can't delete order 
> [% ELSE %]
>- <a href="javascript:confirm_delete_item([% loop_order.ordernumber %],[% loop_order.biblionumber %])" class="button">Delete order</a> 
>+ <a href="javascript:confirm_delete_item([% loop_order.ordernumber %],[% loop_order.basketno %],[% loop_order.biblionumber %])" class="button">Delete order</a> 
> [% END %]
> [% IF ( loop_order.can_del_bib ) %]
>- <a href="javascript:confirm_delete_biblio([% loop_order.ordernumber %],[% loop_order.biblionumber %])" class="button">Delete order and catalog record</a> 
>+ <a href="javascript:confirm_delete_biblio([% loop_order.ordernumber %],[% loop_order.basketno %],[% loop_order.biblionumber %])" class="button">Delete order and catalog record</a> 
> [% ELSE %]
> Can't delete order and catalog record 
> [% END %]
>-- 
>1.7.7.1
>

Actions: View | Diff | Splinter Review

Attachments on bug 7120: 6125 | 6187