[Koha-patches] [PATCH] Bug 7833 - unique holiday link broken
Katrin Fischer
Katrin.Fischer.83 at web.de
Sat Apr 14 17:54:22 CEST 2012
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
---
.../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 @@
<tbody>
[% FOREACH EXCEPTION_HOLIDAYS_LOO IN EXCEPTION_HOLIDAYS_LOOP %]
<tr>
- <td><a href="/cgi-bin/koha/tools/holidays.pl?branch=[% EXCEPTION_HOLIDAYS_LOO.branch %]&calendardate=[% EXCEPTION_HOLIDAYS_LOO.DATE %]">[% EXCEPTION_HOLIDAYS_LOO.DATE %]</a></td>
+ <td><a href="/cgi-bin/koha/tools/holidays.pl?branch=[% branch %]&calendardate=[% EXCEPTION_HOLIDAYS_LOO.DATE %]">[% EXCEPTION_HOLIDAYS_LOO.DATE %]</a></td>
<td>[% EXCEPTION_HOLIDAYS_LOO.TITLE %]</td>
<td>[% EXCEPTION_HOLIDAYS_LOO.DESCRIPTION %]</td>
</tr>
@@ -512,7 +512,7 @@
<tbody>
[% FOREACH HOLIDAYS_LOO IN HOLIDAYS_LOOP %]
<tr>
- <td><a href="/cgi-bin/koha/tools/holidays.pl?branch=[% HOLIDAYS_LOO.branch %]&calendardate=[% HOLIDAYS_LOO.DATE %]">[% HOLIDAYS_LOO.DATE %]</a></td>
+ <td><a href="/cgi-bin/koha/tools/holidays.pl?branch=[% branch %]&calendardate=[% HOLIDAYS_LOO.DATE %]">[% HOLIDAYS_LOO.DATE %]</a></td>
<td>[% HOLIDAYS_LOO.TITLE %]</td>
<td>[% HOLIDAYS_LOO.DESCRIPTION %]</td>
</tr>
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.5.4
More information about the Koha-patches
mailing list