Attachment 23148 Details for Bug 11171 – [PASSED QA] Bug 11171: Display basket group name on the supplier list page

[patch] [PASSED QA] Bug 11171: Display basket group name on the supplier list page

PASSED-QA-Bug-11171-Display-basket-group-name-on-t.patch (text/plain), 3.33 KB, created by Katrin Fischer on 2013-11-25 20:59:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2013-11-25 20:59:47 UTC

Size: 3.33 KB

patch

obsolete

>From dc166a1f7ead83ef3b054531bdcd633d6ce2305c Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Wed, 30 Oct 2013 15:48:10 +0100
>Subject: [PATCH] [PASSED QA] Bug 11171: Display basket group name on the
> supplier list page
>
>Test plan:
>search supplier and verify the basket group column is filled.
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
>Passes all tests and QA script.
>Works as described.
>---
> acqui/booksellers.pl                                         |  6 ++++++
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt | 11 +++++++++++
> 2 files changed, 17 insertions(+)
>
>diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl
>index 80a42f1..04aa2b8 100755
>--- a/acqui/booksellers.pl
>+++ b/acqui/booksellers.pl
>@@ -136,6 +136,12 @@ for my $vendor (@suppliers) {
>                 $basket->{authorisedby_firstname} = $member->{firstname};
>                 $basket->{authorisedby_surname} = $member->{surname};
>             }
>+            if ($basket->{basketgroupid}) {
>+                my $basketgroup = C4::Acquisition::GetBasketgroup($basket->{basketgroupid});
>+                if ($basketgroup) {
>+                    $basket->{basketgroup} = $basketgroup;
>+                }
>+            }
>             push @{$loop_basket}, $basket; 
>         }
>     }
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
>index 3dae586..5ee7352 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
>@@ -102,6 +102,7 @@ $(document).ready(function() {
>                                     <th>Items expected</th>
>                                     <th>Created by</th>
>                                     <th>Date</th>
>+                                    <th>Basket group</th>
>                                     <th>Closed</th>
>                                     <th>&nbsp;</th>
>                                 </tr>
>@@ -124,6 +125,16 @@ $(document).ready(function() {
>                                         </td>
>                                         <td><span title="[% basket.creationdate %]">[% basket.creationdate | $KohaDates %]</span></td>
>                                         <td>
>+                                          [% IF basket.basketgroup %]
>+                                            [% basketgroup = basket.basketgroup %]
>+                                            [% IF basketgroup.closed %]
>+                                              [% basketgroup.name %] (closed)
>+                                            [% ELSE %]
>+                                              <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basket.booksellerid %]&basketgroupid=[% basketgroup.id %]">[% basketgroup.name %]</a>
>+                                            [% END %]
>+                                          [% END %]
>+                                        </td>
>+                                        <td>
>                                             [% IF ( basket.closedate ) %]
>                                                 <span title="[% basket.closedate %]">[% basket.closedate | $KohaDates %]</span>
>                                             [% ELSE %]
>-- 
>1.8.3.2

Actions: View | Diff | Splinter Review

Attachments on bug 11171: 22598 | 22936 | 23130 | 23148 | 23149