Bugzilla – Attachment 19740 Details for
Bug 8133
hourly loans doesn't know when library closed
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Followup to bug 8133 - fix JS escaping in data literals
Followup-to-bug-8133---fix-JS-escaping-in-data-lit.patch (text/plain), 3.39 KB, created by
Liz Rea
on 2013-07-18 01:16:29 UTC
(
hide
)
Description:
Followup to bug 8133 - fix JS escaping in data literals
Filename:
MIME Type:
Creator:
Liz Rea
Created:
2013-07-18 01:16:29 UTC
Size:
3.39 KB
patch
obsolete
>From 8e8aa7992ef5388c3a6ff0e7cc5785e78cf5cfcf Mon Sep 17 00:00:00 2001 >From: Jesse Weaver <pianohacker@gmail.com> >Date: Mon, 8 Jul 2013 15:49:51 -0600 >Subject: [PATCH] Followup to bug 8133 - fix JS escaping in data literals > >There was some unescaped data being put into JS literals, which could >cause the calendar interface to fail to load. > >Note for testing: Template::Plugin::JavaScript must be installed, either >from CPAN or libtemplate-plugin-javascript-perl. > >Signed-off-by: Liz Rea <liz@catalyst.net.nz> >Interface seems to work, I don't note any regressions. > >I tested the following: > >Normal, non holiday circulation with no hours set - due dates seem correct and consistent. >Holiday set for today, library opens at 9am, closes at 10:30am. Item checked out at 10am, due 10:30am - seems right! UseDaysMode was set to "calendar" >Holiday set for today, library opens at 9am, closes at 10:30am. Item checked out at 10am, due tomorrow at 9:30 - seems right! UseDaysMode was set to "days" >Interface looks nice, thanks! >--- > C4/Installer/PerlDependencies.pm | 5 +++++ > .../prog/en/modules/tools/calendar.tt | 13 +++++++------ > 2 files changed, 12 insertions(+), 6 deletions(-) > >diff --git a/C4/Installer/PerlDependencies.pm b/C4/Installer/PerlDependencies.pm >index ca220aa..aa28f37 100644 >--- a/C4/Installer/PerlDependencies.pm >+++ b/C4/Installer/PerlDependencies.pm >@@ -689,6 +689,11 @@ our $PERL_DEPS = { > 'required' => '1', > 'min_ver' => '0.22', > }, >+ 'Template::Plugin::JavaScript' => { >+ 'usage' => 'Core', >+ 'required' => '1', >+ 'min_ver' => '0.02', >+ }, > }; > > 1; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/calendar.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/calendar.tt >index 686e9dc..e00dc02 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/calendar.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/calendar.tt >@@ -1,3 +1,4 @@ >+[% USE 'JavaScript' %] > [% USE 'KohaDates' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › [% branchname %] Calendar</title> >@@ -15,8 +16,8 @@ > var single_events = { > [% FOREACH event IN single_events %] > '[% event.event_date %]': { >- title: '[% event.title %]', >- description: '[% event.description %]', >+ title: '[% event.title | js %]', >+ description: '[% event.description | js %]', > closed: [% event.closed %], > eventType: 'single', > open_hour: '[% event.open_hour %]', >@@ -30,8 +31,8 @@ > var weekly_events = { > [% FOREACH event IN weekly_events %] > [% event.weekday %]: { >- title: '[% event.title %]', >- description: '[% event.description %]', >+ title: '[% event.title | js %]', >+ description: '[% event.description | js %]', > closed: [% event.closed %], > eventType: 'weekly', > weekday: [% event.weekday %], >@@ -46,8 +47,8 @@ > var yearly_events = { > [% FOREACH event IN yearly_events %] > '[% event.month %]-[% event.day %]': { >- title: '[% event.title %]', >- description: '[% event.description %]', >+ title: '[% event.title | js %]', >+ description: '[% event.description | js %]', > closed: [% event.closed %], > eventType: 'yearly', > month: [% event.month %], >-- >1.7.9.5
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 8133
:
19326
|
19494
|
19740
|
29336
|
31973
|
32176
|
32327
|
32985
|
32986
|
32990
|
32991