Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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 <nengard@bywatersolutions.com>

Clicked links for unique holidays and exceptions for
multiple branches and everything works perfectly.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
  • Loading branch information...
commit b302e4a5258d718d261eb37ef6dab28eb7ae6b3e 1 parent d8aa557
@kfischer kfischer authored PaulPoulain committed
View
4 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 %]&amp;calendardate=[% EXCEPTION_HOLIDAYS_LOO.DATE %]">[% EXCEPTION_HOLIDAYS_LOO.DATE %]</a></td>
+ <td><a href="/cgi-bin/koha/tools/holidays.pl?branch=[% branch %]&amp;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 %]&amp;calendardate=[% HOLIDAYS_LOO.DATE %]">[% HOLIDAYS_LOO.DATE %]</a></td>
+ <td><a href="/cgi-bin/koha/tools/holidays.pl?branch=[% branch %]&amp;calendardate=[% HOLIDAYS_LOO.DATE %]">[% HOLIDAYS_LOO.DATE %]</a></td>
<td>[% HOLIDAYS_LOO.TITLE %]</td>
<td>[% HOLIDAYS_LOO.DESCRIPTION %]</td>
</tr>
View
26 tools/holidays.pl
@@ -138,18 +138,20 @@
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;
Please sign in to comment.
Something went wrong with that request. Please try again.