Bugzilla – Attachment 34851 Details for
Bug 13504
The marker '----' is not removed for CHECKIN and CHECKOUT
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 13504: Remove the '----' marker for CHECKIN and CHECKOUT notices
Bug-13504-Remove-the------marker-for-CHECKIN-and-C.patch (text/plain), 1.44 KB, created by
Chris Cormack
on 2015-01-01 06:17:21 UTC
(
hide
)
Description:
Bug 13504: Remove the '----' marker for CHECKIN and CHECKOUT notices
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2015-01-01 06:17:21 UTC
Size:
1.44 KB
patch
obsolete
>From 6e6d68211b9a6e3506c128d7cf55856e6fddc94b Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Wed, 31 Dec 2014 13:23:06 +0100 >Subject: [PATCH] Bug 13504: Remove the '----' marker for CHECKIN and CHECKOUT > notices > >If only 1 item exist in the message, the marker is not removed. >This marker is removed by render_metadata, but this method is only >called on appending. > >Test plan: >1/ Enable the CHECKIN and/or CHECKOUT notices for a patron >2/ check and item in or out and verify that the marker is no longer >displayed in the generated notices. > >Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> >--- > C4/Message.pm | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > >diff --git a/C4/Message.pm b/C4/Message.pm >index a63b3ca..eb27a20 100644 >--- a/C4/Message.pm >+++ b/C4/Message.pm >@@ -159,8 +159,13 @@ sub enqueue { > my ($class, $letter, $borrower, $transport) = @_; > my $metadata = _metadata($letter); > my $to_address = _to_address($borrower, $transport); >+ >+ # Same as render_metadata >+ my $format ||= sub { $_[0] || "" }; >+ my $body = join('', map { $format->($_) } @{$metadata->{body}}); >+ $letter->{content} = $metadata->{header} . $body . $metadata->{footer}; >+ > $letter->{metadata} = Dump($metadata); >- #carp "enqueuing... to $to_address"; > C4::Letters::EnqueueLetter({ > letter => $letter, > borrowernumber => $borrower->{borrowernumber}, >-- >2.1.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 13504
:
34846
|
34851
|
34896