]> git.koha-community.org Git - koha.git/commit
Bug 25723: Use the same code for single and exception holidays
authorMartin Renvoize <martin.renvoize@ptfs-europe.com>
Wed, 17 Jun 2020 10:14:30 +0000 (11:14 +0100)
committerLucas Gass <lucas@bywatersolutions.com>
Mon, 27 Jul 2020 17:39:23 +0000 (17:39 +0000)
commit8cf7e47b2cd1341435f53db43dfc4bfcd957c558
treead24293d739bf5cade346c0df2c00a6b3be49d90
parent955a5d77d0793cfbad950ac917beda5a2a9afe84
Bug 25723: Use the same code for single and exception holidays

This patch refactors is_exception_holiday and is_single_holiday to
utilise a single _holidays method which combines the logic of the
previous single_holidays and exception_holidays methods.

As Koha::Calendar is instantiated at a branch level, we also move split
the cache into branches too.

Signed-off-by: Emma Perks <Emma.Perks2@uhb.nhs.uk>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Joonas Kylmälä <joonas.kylmala@helsinki.fi>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit ae0b2befe8c9086df24469cb546c7c5f8d98de95)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Koha/Calendar.pm