]> git.koha-community.org Git - koha.git/commit
Fix for Bug 6586 - calendar showing the wrong event type when editing
authorOwen Leonard <oleonard@myacpl.org>
Wed, 13 Jul 2011 13:55:32 +0000 (09:55 -0400)
committerChris Nighswonger <chris.nighswonger@gmail.com>
Fri, 15 Jul 2011 01:12:09 +0000 (21:12 -0400)
commit0461c8e5adb956214ccac1e8e3a308a194fbe99a
tree412a6f2a53f2fab5242be6805b6e2dc96f1138a0
parentd078dd39afc2dd5c9873f8c71cd40ce5902b83a4
Fix for Bug 6586 - calendar showing the wrong event type when editing

This bug must have been present for a while. There wasn't proper
handling of repeating yearly holidays when it came to the label.

To be clear, I believe this bug only affected holidays which repeat
yearly on the same date.

Instead of correcting the label to match the existing scheme I
added a new color code and label so that there are now two styles
for yearly and weekly repeating holdiays. This makes it more
clear what kind of repeating holiday you're looking at (rather
than having one color code for both).

After applying this patch, new and existing holidays which
repeat yearly on the same day should be color-coded orange and have
a 'Holiday repeating yearly' label. Weekly holidays are now
labeled 'Holiday repeating weekly.'

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1b0a8e997b2ec09e657fb04058533801abe5ec66)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt