Bugzilla – Attachment 63952 Details for
Bug 18689
Fix calendar error with double quotes in title or description of holiday
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Fix calendar error with double quotes in title or description of holiday
Fix-calendar-error-with-double-quotes-in-title-or-.patch (text/plain), 2.88 KB, created by
Marc Véron
on 2017-06-04 16:13:06 UTC
(
hide
)
Description:
Fix calendar error with double quotes in title or description of holiday
Filename:
MIME Type:
Creator:
Marc Véron
Created:
2017-06-04 16:13:06 UTC
Size:
2.88 KB
patch
obsolete
>From 715ba4c542ee056e9a50839b0a87da40717e3ff9 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch> >Date: Sun, 4 Jun 2017 18:04:00 +0200 >Subject: [PATCH] Fix calendar error with double quotes in title or description > of holiday > >This patch fixes the calendar display with holidays having double qoutes in >title or description. > >To test: >- Apply patch >- Go to Home > Tools > Calendar >- Create new holidays of each type (Day only, repeated wekly/yearly, > range, yearly repeated range and enter double qoutes in their titles and > descriptions >- Verify that calendar displays and works as expected >- Verify that you can edit the holidays > >https://bugs.koha-community.org/show_bug.cgi?id=18689 >--- > koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt | 9 ++++----- > 1 file changed, 4 insertions(+), 5 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 27a060c..4aa4e3a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >@@ -17,18 +17,17 @@ > var day_month_holidays = new Array(); > var hola= "[% code %]"; > [% FOREACH WEEK_DAYS_LOO IN WEEK_DAYS_LOOP %] >- week_days["[% WEEK_DAYS_LOO.KEY %]"] = {title:"[% WEEK_DAYS_LOO.TITLE %]", description:"[% WEEK_DAYS_LOO.DESCRIPTION %]"}; >+ week_days["[% WEEK_DAYS_LOO.KEY %]"] = {title:"[% WEEK_DAYS_LOO.TITLE | replace('"','\"') %]", description:"[% WEEK_DAYS_LOO.DESCRIPTION | replace('"','\"') %]"}; > [% END %] > [% FOREACH HOLIDAYS_LOO IN HOLIDAYS_LOOP %] > holidates.push("[% HOLIDAYS_LOO.KEY %]"); >- holidays["[% HOLIDAYS_LOO.KEY %]"] = {title:"[% HOLIDAYS_LOO.TITLE %]", description:"[% HOLIDAYS_LOO.DESCRIPTION %]"}; >- >+ holidays["[% HOLIDAYS_LOO.KEY %]"] = {title:"[% HOLIDAYS_LOO.TITLE | replace('"','\"') %]", description:"[% HOLIDAYS_LOO.DESCRIPTION | replace('"','\"') %]"}; > [% END %] > [% FOREACH EXCEPTION_HOLIDAYS_LOO IN EXCEPTION_HOLIDAYS_LOOP %] >- exception_holidays["[% EXCEPTION_HOLIDAYS_LOO.KEY %]"] = {title:"[% EXCEPTION_HOLIDAYS_LOO.TITLE %]", description:"[% EXCEPTION_HOLIDAYS_LOO.DESCRIPTION %]"}; >+ exception_holidays["[% EXCEPTION_HOLIDAYS_LOO.KEY %]"] = {title:"[% EXCEPTION_HOLIDAYS_LOO.TITLE | replace('"','\"') %]", description:"[% EXCEPTION_HOLIDAYS_LOO.DESCRIPTION | replace('"','\"') %]"}; > [% END %] > [% FOREACH DAY_MONTH_HOLIDAYS_LOO IN DAY_MONTH_HOLIDAYS_LOOP %] >- day_month_holidays["[% DAY_MONTH_HOLIDAYS_LOO.KEY %]"] = {title:"[% DAY_MONTH_HOLIDAYS_LOO.TITLE %]", description:"[% DAY_MONTH_HOLIDAYS_LOO.DESCRIPTION %]"}; >+ day_month_holidays["[% DAY_MONTH_HOLIDAYS_LOO.KEY %]"] = {title:"[% DAY_MONTH_HOLIDAYS_LOO.TITLE | replace('"','\"') %]", description:"[% DAY_MONTH_HOLIDAYS_LOO.DESCRIPTION | replace('"','\"') %]"}; > [% END %] > > function holidayOperation(formObject, opType) { >-- >2.1.4
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 18689
:
63946
|
63949
|
63950
|
63951
|
63952
|
63961
|
64143