From 8c8d86ef30f38d13f75d7ed1600b3d27b70a6568 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Thu, 13 Jun 2019 11:06:29 -0500
Subject: [PATCH] Bug 23117: Shortcut additem.pl on nonexistent biblionumber

To prevent additem.pl to crash when called with a nonexistent
biblionumber we are here implementing the blocking_error.inc trick to
display a friendly message instead.

Can't call method "fields" on an undefined value at
/home/vagrant/kohaclone/cataloguing/additem.pl line 736.

Test plan:
hit
/cataloguing/additem.pl?biblionumber=
/cataloguing/additem.pl?biblionumber=424242
You will get a friendly "Bibliographic record not found." message,
instead of a 500

Signed-off-by: Bin Wen <bin.wen@inlibro.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 62ae7ac7275329f6396d656a216ffc95b4f9494a)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 C4/Output.pm                                                  | 4 ++++
 cataloguing/additem.pl                                        | 4 ++++
 .../intranet-tmpl/prog/en/modules/cataloguing/additem.tt      | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/C4/Output.pm b/C4/Output.pm
index e8a86cc5ed..b107e27606 100644
--- a/C4/Output.pm
+++ b/C4/Output.pm
@@ -338,6 +338,10 @@ sub output_and_exit_if_error {
             elsif( not $logged_in_user->can_see_patron_infos( $current_patron ) ) {
                 $error = 'cannot_see_patron_infos';
             }
+        } elsif ( $params->{module} eq 'cataloguing' ) {
+            # We are testing the record to avoid additem to fetch the Koha::Biblio
+            # But in the long term we will want to get a biblio in parameter
+            $error = 'unknown_biblio' unless $params->{record};
         }
     }
 
diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
index 062d335107..a7db81557b 100755
--- a/cataloguing/additem.pl
+++ b/cataloguing/additem.pl
@@ -421,6 +421,10 @@ $restrictededition = 0 if ($restrictededition != 0 && $frameworkcode eq 'FA' &&
 
 my $tagslib = &GetMarcStructure(1,$frameworkcode);
 my $record = GetMarcBiblio({ biblionumber => $biblionumber });
+
+output_and_exit_if_error( $input, $cookie, $template,
+    { module => 'cataloguing', record => $record } );
+
 my $oldrecord = TransformMarcToKoha($record);
 my $itemrecord;
 my $nextop="additem";
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
index 2dd65df7aa..25fcf73dd2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
@@ -32,7 +32,7 @@
     <div class="row">
         <div class="col-sm-12">
             <main>
-
+                [% INCLUDE 'blocking_errors.inc' %]
 <h1>Items for [% title | html %] [% IF ( author ) %] by [% author | html %][% END %] (Record #[% biblionumber | html %])</h1>
 
 [% IF ( barcode_not_unique ) %]<div class="dialog alert"><strong>Error saving item</strong>: Barcode must be unique.</div>[% END %]
-- 
2.39.5