Bugzilla – Attachment 186447 Details for
Bug 38633
Calendar - Weekly closures are ignored when setting a yearly repeating holiday
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 38633: Prevent holidays from being ignored
Bug-38633-Prevent-holidays-from-being-ignored.patch (text/plain), 2.47 KB, created by
Marion Durand
on 2025-09-16 06:55:45 UTC
(
hide
)
Description:
Bug 38633: Prevent holidays from being ignored
Filename:
MIME Type:
Creator:
Marion Durand
Created:
2025-09-16 06:55:45 UTC
Size:
2.47 KB
patch
obsolete
>From 6cc124dd2e2e53df77013e69bdcc285f53625f37 Mon Sep 17 00:00:00 2001 >From: Alexander Blanchard <alexander.blanchard@openfifth.co.uk> >Date: Mon, 15 Sep 2025 15:11:05 +0000 >Subject: [PATCH] Bug 38633: Prevent holidays from being ignored > >If weekly repeatable holidays are set, Koha ignores these days when other holidays are set using the Holidays repeated yearly on a range option. > >To test: >1) Navigate to Tools > Calendar >2) Click on a weekend date on the calendar to open the Add New Holiday option >3) Give your holiday a title and select Holiday repeated every same day of the week >4) Click on the calendar again and set a holiday from 20 December 2021 to 06 January 2022 >5) Give your holiday a title >6) Select Holidays repeated yearly on a range and click save >7) Using the calendar, navigate forwards to December 2024 and note that there are days that should be highlighted in the holdiay period that are not highlighted >8) Apply Patch >9) Run the reset_all command >10) Repeat the steps above >11) Notice that now when you click forwards through the calendar, all of the dates for your holidays repeated yearly on a range are still selected > >Signed-off-by: Marion Durand <marion.durand@biblibre.com> >--- > tools/newHolidays.pl | 19 ++++++------------- > 1 file changed, 6 insertions(+), 13 deletions(-) > >diff --git a/tools/newHolidays.pl b/tools/newHolidays.pl >index 9cca4a9bc9..226328f975 100755 >--- a/tools/newHolidays.pl >+++ b/tools/newHolidays.pl >@@ -138,19 +138,12 @@ sub add_holiday { > } elsif ( $newoperation eq 'holidayrangerepeat' ) { > if (@holiday_list) { > foreach my $date (@holiday_list) { >- unless ( >- $calendar->isHoliday( >- $date->{local_c}->{day}, $date->{local_c}->{month}, $date->{local_c}->{year} >- ) >- ) >- { >- $calendar->insert_day_month_holiday( >- day => $date->{local_c}->{day}, >- month => $date->{local_c}->{month}, >- title => $title, >- description => $description >- ); >- } >+ $calendar->insert_day_month_holiday( >+ day => $date->{local_c}->{day}, >+ month => $date->{local_c}->{month}, >+ title => $title, >+ description => $description >+ ); > } > } > } >-- >2.39.5
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 38633
:
180489
|
180533
|
180728
|
186432
|
186435
|
186447
|
186612