Bug 20640: (follow-up) Degrade gracefully on error

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

diff --git a/Koha/Illrequest.pm b/Koha/Illrequest.pm
index f9b4995..ff834f1 100644 (file)
--- a/Koha/Illrequest.pm
+++ b/Koha/Illrequest.pm
@@ -536,11 +536,12 @@ Migrate a request from one backend to another.
 sub backend_migrate {
     my ( $self, $params ) = @_;
 
-    my $response = $self->_backend->migrate({
+    my $response = $self->_backend_capability('migrate',{
             request    => $self,
             other      => $params,
         });
-    return $self->expandTemplate($response);
+    return $self->expandTemplate($response) if $response;
+    return $response;
 }
 
 =head2 backend_confirm

diff --git a/ill/ill-requests.pl b/ill/ill-requests.pl
index 0a29785..77a8d05 100755 (executable)
--- a/ill/ill-requests.pl
+++ b/ill/ill-requests.pl
@@ -93,10 +93,26 @@ if ( $backends_available ) {
         if ( $params->{backend} ) {
             my $new_request = Koha::Illrequest->new->load_backend( $params->{backend} );
             $backend_result = $new_request->backend_migrate($params);
-            $template->param(
-                whole   => $backend_result,
-                request => $new_request
-            );
+            if ($backend_result) {
+                $template->param(
+                    whole   => $backend_result,
+                    request => $new_request
+                );
+            } else {
+                # backend failure
+                $backend_result = {
+                    stage => 'commit',
+                    next  => 'illview',
+                    error => {
+                        message => 'Migrating to backedn does not support migrate',
+                        status => 'Migrating to backedn does not support migrate'
+                    }
+                };
+                $template->param(
+                    whole   => $backend_result,
+                    request => $request
+                );
+            }
         }
         else {
             $request = Koha::Illrequests->find( $params->{illrequest_id} );