From 79bedc5461be75b16e1153fa3b13cd617fa63167 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sat, 14 Apr 2012 17:50:51 +0200 Subject: [PATCH] [SIGNED-OFF] Bug 7833 - unique holiday link broken As Nicole stated on the bug the branchcode was missing from the links. To test: - add unique holidays to calendar for different branches - click on link and check that the date is opened in the right calendar Signed-off-by: Nicole C. Engard Clicked links for unique holidays and exceptions for multiple branches and everything works perfectly. --- .../prog/en/modules/tools/holidays.tt | 4 +- tools/holidays.pl | 26 ++++++++++--------- 2 files changed, 16 insertions(+), 14 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 ef204d2..6e50425 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt @@ -438,7 +438,7 @@ [% FOREACH EXCEPTION_HOLIDAYS_LOO IN EXCEPTION_HOLIDAYS_LOOP %] - [% EXCEPTION_HOLIDAYS_LOO.DATE %] + [% EXCEPTION_HOLIDAYS_LOO.DATE %] [% EXCEPTION_HOLIDAYS_LOO.TITLE %] [% EXCEPTION_HOLIDAYS_LOO.DESCRIPTION %] @@ -512,7 +512,7 @@ [% FOREACH HOLIDAYS_LOO IN HOLIDAYS_LOOP %] - [% HOLIDAYS_LOO.DATE %] + [% HOLIDAYS_LOO.DATE %] [% HOLIDAYS_LOO.TITLE %] [% HOLIDAYS_LOO.DESCRIPTION %] diff --git a/tools/holidays.pl b/tools/holidays.pl index b3912eb..d5ace27 100755 --- a/tools/holidays.pl +++ b/tools/holidays.pl @@ -138,18 +138,20 @@ foreach my $yearMonthDay (keys %$single_holidays) { push @holidays, \%holiday; } -$template->param(WEEK_DAYS_LOOP => \@week_days, - branchloop => \@branchloop, - HOLIDAYS_LOOP => \@holidays, - EXCEPTION_HOLIDAYS_LOOP => \@exception_holidays, - DAY_MONTH_HOLIDAYS_LOOP => \@day_month_holidays, - calendardate => $calendardate, - keydate => $keydate, - branchcodes => $branchcodes, - branch => $branch, - DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), - branchname => $branchname - ); +$template->param( + WEEK_DAYS_LOOP => \@week_days, + branchloop => \@branchloop, + HOLIDAYS_LOOP => \@holidays, + EXCEPTION_HOLIDAYS_LOOP => \@exception_holidays, + DAY_MONTH_HOLIDAYS_LOOP => \@day_month_holidays, + calendardate => $calendardate, + keydate => $keydate, + branchcodes => $branchcodes, + branch => $branch, + DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), + branchname => $branchname, + branch => $branch, +); # Shows the template with the real values replaced output_html_with_http_headers $input, $cookie, $template->output; -- 1.7.2.3