Bugzilla – Attachment 41885 Details for
Bug 14703
Holidays description shows \r\n for every new line
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 14703: Holidays description shows \r\n for every new line
Bug-14703-Holidays-description-shows-rn-for-every-.patch (text/plain), 1.66 KB, created by
Joonas Kylmälä
on 2015-08-25 07:31:35 UTC
(
hide
)
Description:
Bug 14703: Holidays description shows \r\n for every new line
Filename:
MIME Type:
Creator:
Joonas Kylmälä
Created:
2015-08-25 07:31:35 UTC
Size:
1.66 KB
patch
obsolete
>From 9fd6df4a458834a241b0ab90ce1d2b88bbcff593 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Joonas=20Kylm=C3=A4l=C3=A4?= <j.kylmala@gmail.com> >Date: Tue, 25 Aug 2015 07:24:54 +0000 >Subject: [PATCH] Bug 14703: Holidays description shows \r\n for every new line > >Adds a new line for the holiday's description instead of the string >\r\n. > >Test plan: >1. In tools -> Calendar look at some holiday's description > (Do a new holiday with description of multiple lines if > there is not already) >2. Notice that there is characters \r\n if someone has put > a newline in the holiday's description >3. Apply patch >4. See that the new lines show there now nicely > >Sponsored-by: Vaara-kirjastot >--- > koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >index b3c31a0..d79c111 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >@@ -517,8 +517,8 @@ td.repeatableyearly a.ui-state-default { background: #FFCC66 none; color : Bl > [% FOREACH HOLIDAYS_LOO IN HOLIDAYS_LOOP %] > <tr> > <td><a href="/cgi-bin/koha/tools/holidays.pl?branch=[% branch %]&calendardate=[% HOLIDAYS_LOO.DATE %]"><span title="[% HOLIDAYS_LOO.DATE_SORT %]">[% HOLIDAYS_LOO.DATE %]</span></a></td> >- <td>[% HOLIDAYS_LOO.TITLE %]</td> >- <td>[% HOLIDAYS_LOO.DESCRIPTION %]</td> >+ <td>[% HOLIDAYS_LOO.TITLE.replace('\\\r\\\n', '<br />') %]</td> >+ <td>[% HOLIDAYS_LOO.DESCRIPTION.replace('\\\r\\\n', '<br />') %]</td> > </tr> > [% END %] > </tbody> >-- >1.9.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 14703
:
41885
|
42025