From 6a366faf3fd1d4f14eff013fe4e2f7d949018410 Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Fri, 9 Feb 2024 08:14:32 +0000
Subject: [PATCH] Bug 34478: Changes for tools/holidays

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt | 3 +++
 tools/copy-holidays.pl                                    | 5 ++++-
 tools/exceptionHolidays.pl                                | 7 ++++---
 tools/newHolidays.pl                                      | 5 +++--
 4 files changed, 14 insertions(+), 6 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 b65c657e32..e342ac1b8e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
@@ -48,6 +48,7 @@
                             <div class="panel" id="showHoliday">
                                 <form action="/cgi-bin/koha/tools/exceptionHolidays.pl" method="post">
                                     [% INCLUDE 'csrf-token.inc' %]
+                                    <input type="hidden" name="op" value="cud-edit" />
                                     <input type="hidden" id="showHolidayType" name="showHolidayType" value="" />
                                     <fieldset class="brief">
                                         <h3>Edit this holiday</h3>
@@ -145,6 +146,7 @@
                             <div class="panel" id="newHoliday">
                                 <form action="/cgi-bin/koha/tools/newHolidays.pl" method="post">
                                     [% INCLUDE 'csrf-token.inc' %]
+                                    <input type="hidden" name="op" value="cud-add" />
                                     <fieldset class="brief">
                                         <h3>Add new holiday</h3>
                                         <ol>
@@ -237,6 +239,7 @@
                             <div style="margin-top: 2em;">
                                 <form action="copy-holidays.pl" method="post">
                                     [% INCLUDE 'csrf-token.inc' %]
+                                    <input type="hidden" name="op" value="cud-copy" />
                                     <input type="hidden" name="from_branchcode" value="[% branch | html %]" />
                                     <label for="branchcode">Copy holidays to:</label>
                                     <select id="branchcode" name="branchcode">
diff --git a/tools/copy-holidays.pl b/tools/copy-holidays.pl
index 381f9e70a5..e77449e12d 100755
--- a/tools/copy-holidays.pl
+++ b/tools/copy-holidays.pl
@@ -28,6 +28,7 @@ use C4::Output;
 use C4::Calendar;
 
 my $input               = CGI->new;
+my $op                  = $input->param('op') // q{};
 my $dbh                 = C4::Context->dbh();
 
 checkauth($input, 0, {tools=> 'edit_calendar'}, 'intranet');
@@ -35,6 +36,8 @@ checkauth($input, 0, {tools=> 'edit_calendar'}, 'intranet');
 my $branchcode          = $input->param('branchcode');
 my $from_branchcode     = $input->param('from_branchcode');
 
-C4::Calendar->new(branchcode => $from_branchcode)->copy_to_branch($branchcode) if $from_branchcode && $branchcode;
+if ( $op eq 'cud-copy' ) {
+    C4::Calendar->new( branchcode => $from_branchcode )->copy_to_branch($branchcode) if $from_branchcode && $branchcode;
+}
 
 print $input->redirect("/cgi-bin/koha/tools/holidays.pl?branch=".($branchcode || $from_branchcode));
diff --git a/tools/exceptionHolidays.pl b/tools/exceptionHolidays.pl
index 42d4d6348d..f538638c45 100755
--- a/tools/exceptionHolidays.pl
+++ b/tools/exceptionHolidays.pl
@@ -12,7 +12,8 @@ use C4::Calendar;
 use Koha::DateUtils qw( dt_from_string );
 
 my $input = CGI->new;
-my $dbh = C4::Context->dbh();
+my $op    = $input->param('op') // q{};
+my $dbh   = C4::Context->dbh();
 
 checkauth($input, 0, {tools=> 'edit_calendar'}, 'intranet');
 
@@ -52,12 +53,12 @@ if ($datecancelrange_dt){
                 }
 }
 
-if($allbranches) {
+if ( $op eq 'cud-edit' && $allbranches ) {
     my $libraries = Koha::Libraries->search;
     while ( my $library = $libraries->next ) {
         edit_holiday($showoperation, $library->branchcode, $weekday, $day, $month, $year, $title, $description, $holidaytype, @holiday_list);
     }
-} else {
+} elsif( $op eq 'cud-edit' ) {
     edit_holiday($showoperation, $branchcode, $weekday, $day, $month, $year, $title, $description, $holidaytype, @holiday_list);
 }
 
diff --git a/tools/newHolidays.pl b/tools/newHolidays.pl
index b07079d52b..c8215f1b4f 100755
--- a/tools/newHolidays.pl
+++ b/tools/newHolidays.pl
@@ -29,6 +29,7 @@ use DateTime;
 use Koha::DateUtils qw( dt_from_string output_pref );
 
 my $input               = CGI->new;
+my $op                  = $input->param('op') // q{};
 my $dbh                 = C4::Context->dbh();
 
 checkauth($input, 0, {tools=> 'edit_calendar'}, 'intranet');
@@ -70,12 +71,12 @@ if ($end_dt){
     }
 }
 
-if($allbranches) {
+if ( $op eq 'cud-add' && $allbranches ) {
     my $libraries = Koha::Libraries->search;
     while ( my $library = $libraries->next ) {
         add_holiday($newoperation, $library->branchcode, $weekday, $day, $month, $year, $title, $description);
     }
-} else {
+} elsif ( $op eq 'cud-add' ) {
     add_holiday($newoperation, $branchcode, $weekday, $day, $month, $year, $title, $description);
 }
 
-- 
2.39.5