Bugzilla – Attachment 9196 Details for
Bug 7833
unique holiday link broken
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 7833 - unique holiday link broken
Bug-7833---unique-holiday-link-broken.patch (text/plain), 3.32 KB, created by
Katrin Fischer
on 2012-04-14 15:52:08 UTC
(
hide
)
Description:
Bug 7833 - unique holiday link broken
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2012-04-14 15:52:08 UTC
Size:
3.32 KB
patch
obsolete
>From 1073f6431d8fae0d1f1de12166249a3369718611 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <Katrin.Fischer.83@web.de> >Date: Sat, 14 Apr 2012 17:50:51 +0200 >Subject: [PATCH] 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 >--- > .../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
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 7833
:
9196
|
9201