Attachment 3920 Details for Bug 6191 – Proposed Patch

[patch] Proposed Patch

0001-Bug-6191-Correct-table-entries-in-basket.tt.patch (text/plain), 4.72 KB, created by Colin Campbell on 2011-04-14 10:34:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Campbell

Created: 2011-04-14 10:34:47 UTC

Size: 4.72 KB

patch

obsolete

>From 73f9b3560998777a45fa01cd881a25c98dd1ad06 Mon Sep 17 00:00:00 2001
>From: Colin Campbell <colin.campbell@ptfs-europe.com>
>Date: Thu, 14 Apr 2011 11:29:33 +0100
>Subject: [PATCH] Bug 6191 Correct table entries in basket.tt
>Content-Type: text/plain; charset="utf-8"
>
>Some non-loop variables were localized to the loop causing
>Modify and Delete links to dissappear
>Gave the loop variable a meaningful name
>---
> .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |   36 ++++++++++----------
> 1 files changed, 18 insertions(+), 18 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>index 737dd40..355cfe4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>@@ -255,30 +255,30 @@
>                 [% END %]
>                 </tfoot>
>                 <tbody>
>-                [% FOREACH books_loo IN books_loop %]
>-                    [% IF ( books_loo.order_received ) %]<tr class="disabled">[% ELSE %][% IF ( books_loo.toggle ) %]<tr class="highlight">[% ELSE %]<tr>[% END %][% END %]
>+                [% FOREACH orderline IN books_loop %]
>+                    [% IF  orderline.order_received %]<tr class="disabled">[% ELSE %][% IF loop.index % 2 %]<tr class="highlight">[% ELSE %]<tr>[% END %][% END %]
>                         <td>
>-                            <p>[% IF ( books_loo.order_received ) %] (rcvd)[% END %]
>-                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% books_loo.biblionumber %]">[% books_loo.title |html %]</a> by [% books_loo.author %]
>-                                    [% IF ( books_loo.notes ) %] [% books_loo.notes %][% END %]
>-                                    [% IF ( books_loo.isbn ) %] - [% books_loo.isbn %][% END %]
>-                                    [% IF ( books_loo.issn ) %] - [% books_loo.issn %][% END %]
>-                                    [% IF ( books_loo.publishercode ) %], [% books_loo.publishercode %][% END %]
>-                                    [% IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear %][% END %]
>+                            <p>[% IF orderline.order_received %] (rcvd)[% END %]
>+                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% orderline.biblionumber %]">[% orderline.title |html %]</a> by [% orderline.author %]
>+                                    [% IF orderline.notes %] [% orderline.notes %][% END %]
>+                                    [% IF orderline.isbn %] - [% orderline.isbn %][% END %]
>+                                    [% IF orderline.issn %] - [% orderline.issn %][% END %]
>+                                    [% IF orderline.publishercode %], [% orderline.publishercode %][% END %]
>+                                    [% IF orderline.publicationyear %], [% orderline.publicationyear %][% END %]
>                             </p>
>                             </td>
>-                        <td class="number">[% books_loo.rrp %]</td>
>-                        <td class="number">[% books_loo.ecost %]</td>
>-                        <td class="number">[% books_loo.quantity %]</td>
>-                        <td class="number">[% books_loo.line_total %]</td>
>-                        <td>[% books_loo.budget_name %]</td>
>-                        [% IF ( books_loo.active ) %]
>-                            [% UNLESS ( books_loo.closedate ) %]
>+                        <td class="number">[% orderline.rrp %]</td>
>+                        <td class="number">[% orderline.ecost %]</td>
>+                        <td class="number">[% orderline.quantity %]</td>
>+                        <td class="number">[% orderline.line_total %]</td>
>+                        <td>[% orderline.budget_name %]</td>
>+                        [% IF active %]
>+                            [% UNLESS closedate %]
>                             <td>
>-                                <a href="neworderempty.pl?ordernumber=[% books_loo.ordernumber %]&amp;booksellerid=[% books_loo.booksellerid %]&amp;basketno=[% books_loo.basketno %]">Modify</a>
>+                                <a href="neworderempty.pl?ordernumber=[% orderline.ordernumber %]&amp;booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">Modify</a>
>                             </td>
>                             <td>
>-                            <a href="javascript:confirm_delete_item([% books_loo.ordernumber %],[% books_loo.biblionumber %])" class="button">Delete</a>
>+                            <a href="javascript:confirm_delete_item([% orderline.ordernumber %],[% orderline.biblionumber %])" class="button">Delete</a>
>                             </td>
>                             [% END %]
>                         [% END %]
>-- 
>1.7.4.2
>

Actions: View | Diff | Splinter Review

Attachments on bug 6191: 3920