http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14703 --- Comment #1 from Joonas Kylmälä <j.kylmala@gmail.com> --- Created attachment 41885 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=41885&action=edit 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 -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14703 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #41885|0 |1 is obsolete| | --- Comment #2 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 42025 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=42025&action=edit 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 Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Amended slightly: no need to replace title. -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14703 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA --- Comment #3 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Taking the liberty to promote this trivial patch to PQA directly. Thanks, Joonas. -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14703 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jonathan.druart@bugs.koha-c | |ommunity.org --- Comment #4 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- IMO this should be done after the input (and correct the values in DB), not on display. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14703 --- Comment #6 from Joonas Kylmälä <j.kylmala@gmail.com> --- (In reply to Joonas Kylmälä from comment #5)

(In reply to Jonathan Druart from comment #4)

...

IMO this should be done after the input (and correct the values in DB), not on display.

I tried that in a way that I left the new line character there, but then there was some JavaScript which refused to work with that. And if we put the <br> tag in the database I'm not sure if it will show in the description as the string <br> or as a new line. Let me try that.

But wait, I think I tried that and the <br> will show in the edit text box as <br>.. So I came to the conclusion that it's much more better to have the fix in only one place. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14703 --- Comment #8 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Hobby holiday project: See newHolidays.pl if ($description) { $description =~ s/\r/\\r/g; $description =~ s/\n/\\n/g; } -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14703 --- Comment #10 from Joonas Kylmälä <j.kylmala@gmail.com> --- (In reply to Marcel de Rooy from comment #8)

Hobby holiday project:

See newHolidays.pl

if ($description) { $description =~ s/\r/\\r/g; $description =~ s/\n/\\n/g; }

I looked into that. Changing the new line into <br> didn't work in the because then we need to also change the description editor to convert <br> to \r\n. So it's similar fix to that what we do now when displaying the description (but more changes with no reason). And so we have done already the fix to change the description so I will go with the current patch. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14703 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |chris@bigballofwax.co.nz Status|Pushed to Master |Pushed to Stable --- Comment #12 from Chris Cormack <chris@bigballofwax.co.nz> --- Pushed to 3.20.x will be in 3.20.4 -- You are receiving this mail because: You are watching all bug changes.