Bug 30952: Fix background color of dialogs (message, alert, error)

[koha-ffzg.git] / reserve / modrequest.pl

diff --git a/reserve/modrequest.pl b/reserve/modrequest.pl
index 3a7c3de..ec78f68 100755 (executable)
--- a/reserve/modrequest.pl
+++ b/reserve/modrequest.pl
@@ -24,11 +24,14 @@
 
 use Modern::Perl;
 use CGI qw ( -utf8 );
+use URI;
 use List::MoreUtils qw( uniq );
+use Try::Tiny;
+
 use C4::Output;
 use C4::Reserves qw( ModReserve ModReserveCancelAll );
 use C4::Auth qw( get_template_and_user );
-use Koha::DateUtils qw( dt_from_string );
+use Koha::BackgroundJob::BatchUpdateBiblioHoldsQueue;
 
 my $query = CGI->new;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -36,7 +39,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "about.tt",
         query           => $query,
         type            => "intranet",
-        flagsrequired   => { catalogue => 1 },
+        flagsrequired   => { reserveforothers => '*' },
     }
 );
 
@@ -73,18 +76,32 @@ else {
         my $params = {
             rank => $rank[$i],
             reserve_id => $reserve_id[$i],
-            expirationdate => $expirationdates[$i] ? dt_from_string($expirationdates[$i]) : undef,
+            expirationdate => $expirationdates[$i] || undef,
             branchcode => $branch[$i],
             itemnumber => $itemnumber[$i],
             defined $suspend_until ? ( suspend_until => $suspend_until ) : (),
             cancellation_reason => $cancellation_reason,
         };
         if (C4::Context->preference('AllowHoldDateInFuture')) {
-            $params->{reservedate} = $reservedates[$i] ? dt_from_string($reservedates[$i]) : undef;
+            $params->{reservedate} = $reservedates[$i] || undef;
         }
 
-        ModReserve($params);
+        try {
+            ModReserve($params);
+        } catch {
+            if ($_->isa('Koha::Exceptions::ObjectNotFound')){
+                warn $_;
+            } else {
+                $_->rethrow;
+            }
+        }
     }
+    my @biblio_ids = uniq @biblionumber;
+    Koha::BackgroundJob::BatchUpdateBiblioHoldsQueue->new->enqueue(
+        {
+            biblio_ids => \@biblio_ids
+        }
+    );
 }
 
 my $from=$query->param('from');
@@ -94,7 +111,7 @@ if ( $from eq 'borrower'){
 } elsif ( $from eq 'circ'){
     print $query->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrower[0]");
 } else {
-     my $url = "/cgi-bin/koha/reserve/request.pl?";
-     $url .= "biblionumbers=" . join('/', @biblionumber);
+     my $url = URI->new("/cgi-bin/koha/reserve/request.pl");
+     $url->query_form( biblionumber => [@biblionumber]);
      print $query->redirect($url);
 }