Bugzilla – Attachment 5240 Details for
Bug 6030
Allow for html in letters in overdue notices
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
proposed patch
0001-Bug-6030-Allow-html-content-in-letters.patch (text/plain), 2.41 KB, created by
Paul Poulain
on 2011-08-31 14:12:52 UTC
(
hide
)
Description:
proposed patch
Filename:
MIME Type:
Creator:
Paul Poulain
Created:
2011-08-31 14:12:52 UTC
Size:
2.41 KB
patch
obsolete
>From 3834c610f6ccf27b158f5ebbfc573f7eb4ce6eba Mon Sep 17 00:00:00 2001 >From: Chris Cormack <chrisc@catalyst.net.nz> >Date: Fri, 1 Apr 2011 11:20:58 +1300 >Subject: [PATCH 1/2] Bug 6030 Allow html content in letters > >Squashed commit of the following: > >commit 8368e5de723ec7607402be341975014c8b7b0ea9 >Author: Henri-Damien LAURENT <henridamien.laurent@biblibre.com> >Date: Tue Sep 21 14:41:07 2010 +0200 > > Bug 6030 : overdue_notices :Removing warning > > Two extra warnings were issued when using html > >commit 5984fc92772af68c51f7f5b5450fd5b27d5b6d37 >Author: Henri-Damien LAURENT <henridamien.laurent@biblibre.com> >Date: Tue Sep 21 12:27:29 2010 +0200 > > Bug 6030 : Letters can be html in overdu_notices.pl >--- > misc/cronjobs/overdue_notices.pl | 14 ++++++++++---- > 1 files changed, 10 insertions(+), 4 deletions(-) > >diff --git a/misc/cronjobs/overdue_notices.pl b/misc/cronjobs/overdue_notices.pl >index 37774b5..9d4a298 100755 >--- a/misc/cronjobs/overdue_notices.pl >+++ b/misc/cronjobs/overdue_notices.pl >@@ -480,7 +480,12 @@ END_SQL > $verbose and warn "STH2 PARAMS: borrowernumber = $borrowernumber, mindays = $mindays, maxdays = $maxdays"; > $sth2->execute(@params); > my $itemcount = 0; >- my $titles = ""; >+ my $titles; >+ if ($htmlfilename) { >+ $titles = "<table id='itemscontent$borrowernumber'>"; >+ $titles .= "<thead><tr><th>" . join( "</th><th>", @$columns_def_hashref{@item_content_fields} ); >+ $titles .= "</th></tr></thead><tbody>"; >+ } > my @items = (); > > my $i = 0; >@@ -508,9 +513,10 @@ END_SQL > } > } > ); >- >- if ( $exceededPrintNoticesMaxLines ) { >- $letter->{'content'} .= "List too long for form; please check your account online for a complete list of your overdue items."; >+ $letter->{'content-type'}="text/".($htmlfilename?"html":"plain"); >+ >+ if ($exceededPrintNoticesMaxLines) { >+ $letter->{'content'} .= "List too long for form; please check your account online for a complete list of your overdue items."; > } > > my @misses = grep { /./ } map { /^([^>]*)[>]+/; ( $1 || '' ); } split /\</, $letter->{'content'}; >-- >1.7.4.1 >
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 6030
:
3596
|
5240
|
5241
|
6251
|
6252
|
12110
|
12111
|
12112
|
12113
|
12231
|
12232
|
12234
|
12235
|
12397
|
12698
|
12699
|
12700
|
12701
|
12772
|
13017
|
13018
|
14128
|
14129