Attachment 40189 Details for Bug 14356 – Bug 14356: Improvements to the 'Transfers to receive' page

[patch] Bug 14356: Improvements to the 'Transfers to receive' page

Bug-14356-Improvements-to-the-Transfers-to-receive.patch (text/plain), 5.26 KB, created by Jonathan Druart on 2015-06-16 15:45:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2015-06-16 15:45:23 UTC

Size: 5.26 KB

patch

obsolete

>From c0baa1844c66decb496fb53f0dfa1565ba5b2e2f Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <Katrin.Fischer.83@web.de>
>Date: Mon, 8 Jun 2015 01:30:58 +0200
>Subject: [PATCH] Bug 14356: Improvements to the 'Transfers to receive' page
>
>Patch makes several small changes to the template for the
>'Transfers to receive page'
>
>1) Show the branch name instead of the branchcode in the
> table of incoming transfers.
>
>If there is a hold connected with the transfer:
>2) Show the patron's name as 'surname, firstname'
> intead of 'surname firstname'
>3) Restore broken feature: Show a mailto: link with a
> generated subject of 'Hold: <title>'.
>
>The mailto: feature actually existed in the templates, but
>was broken to a misnamed database column. I made some small
>changes to make the subject translatable (see bug 8330).
>
>To test:
>- Create a transfer by placing a hold with pickup at another library
>- Craete a transfer manually
>- Go to the circulation > transfers to receive
>- Check the changes explained above, compare before and after
>- Check the mailto: link works as expected
>
>Bonus: Check the Hold: bit in the subject is really translatable now.
>
>Signed-off-by: Nick Clemens <nick@quecheelibrary.org>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@koha-community.org>
>---
> circ/transferstoreceive.pl | 2 +-
> .../prog/en/modules/circ/transferstoreceive.tt | 13 ++++++++-----
> 2 files changed, 9 insertions(+), 6 deletions(-)
>
>diff --git a/circ/transferstoreceive.pl b/circ/transferstoreceive.pl
>index bd184c9..1beb6b3 100755
>--- a/circ/transferstoreceive.pl
>+++ b/circ/transferstoreceive.pl
>@@ -105,7 +105,7 @@ foreach my $br ( keys %$branches ) {
> $getransf{'borrowernum'} = $getborrower->{'borrowernumber'};
> $getransf{'borrowername'} = $getborrower->{'surname'};
> $getransf{'borrowerfirstname'} = $getborrower->{'firstname'};
>- $getransf{'borrowermail'} = $getborrower->{'emailaddress'} if $getborrower->{'emailaddress'};
>+ $getransf{'borrowermail'} = $getborrower->{'email'} if $getborrower->{'email'};
> $getransf{'borrowerphone'} = $getborrower->{'phone'};
> }
> push( @transferloop, \%getransf );
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
>index e1cc760..877be7c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
>@@ -1,4 +1,5 @@
> [% USE KohaDates %]
>+[% USE Branches %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Circulation &rsaquo; Transfers to your library</title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -60,16 +61,18 @@ $(document).ready(function() {
> <td>[% reser.datetransfer | $KohaDates %] [% IF ( reser.messcompa ) %]Transfer is [% reser.diff %] days late[% END %]</td>
> <td>
> [% INCLUDE 'biblio-default-view.inc' biblionumber = reser.biblionumber %][% reser.title |html %] [% IF ( reser.subtitle ) %] [% FOREACH subtitl IN reser.subtitle %][% subtitl.subfield %][% END %][% END %]</a> [% IF ( reser.author ) %]by [% reser.author %][% END %]
>- [% IF ( reser.itemtype ) %]&nbsp; ([% reser.itemtype %])[% END %]
>+ [% IF ( reser.itemtype ) %] ([% reser.itemtype %])[% END %]
> Barcode: [% reser.barcode %]
> </td>
> <td>[% IF ( reser.borrowername ) %]
> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reser.borrowernum %]">
>- [% reser.borrowername %] &nbsp; [% reser.borrowerfirstname %]
>+ [% reser.borrowername %][%IF ( reser.borrowerfirstname ) %], [% reser.borrowerfirstname %][% END %]
> </a>
>- [% reser.borrowerphone %] 
>+ [% IF ( reser.borrowerphone ) %] [% reser.borrowerphone %][% END %]
> [% IF ( reser.borrowermail ) %]
>- <a href="mailto:[% reser.email %]?subject=Reservation: [% reser.title |html %]">
>+ 
>+ [% BLOCK subject %]Hold:[% END %]
>+ <a href="mailto:[% reser.borrowermail %]?subject=[% INCLUDE subject %] [% reser.title |html %]">
> [% reser.borrowermail %]
> </a>
> [% END %]
>@@ -77,7 +80,7 @@ $(document).ready(function() {
> None
> [% END %]
> </td>
>- <td>[% reser.homebranch %]</td>
>+ <td>[% IF reser.homebranch %][% Branches.GetName( reser.homebranch ) %][% END %]</td>
> <td>[% reser.itemcallnumber %]</td>
> <td><a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% reser.itemnumber %]&amp;canceltransfer=1&amp;dest=ttr">Cancel transfer</a></td>
> </tr>
>-- 
>2.1.0

Actions: View | Diff | Splinter Review

Attachments on bug 14356: 39963 | 40084 | 40189