Attachment 83809 Details for Bug 20640 – Bug 20640: (follow-up) Make error message translatable

[patch] Bug 20640: (follow-up) Make error message translatable

Bug-20640-follow-up-Make-error-message-translatabl.patch (text/plain), 3.11 KB, created by Katrin Fischer on 2019-01-11 16:19:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2019-01-11 16:19:25 UTC

Size: 3.11 KB

patch

obsolete

>From d3bde7ba36fa83c3023b7e250e6fdd6a36de48b3 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 11 Jan 2019 14:50:47 +0000
>Subject: [PATCH] Bug 20640: (follow-up) Make error message translatable
>
>Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
>---
> ill/ill-requests.pl                                 | 21 ++++++++-------------
> .../prog/en/modules/ill/ill-requests.tt             |  9 +++++++++
> 2 files changed, 17 insertions(+), 13 deletions(-)
>
>diff --git a/ill/ill-requests.pl b/ill/ill-requests.pl
>index 792b93d241..d962773188 100755
>--- a/ill/ill-requests.pl
>+++ b/ill/ill-requests.pl
>@@ -74,6 +74,7 @@ if ( $backends_available ) {
>             csrf_token => Koha::Token->new->generate_csrf({
>                 session_id => scalar $cgi->cookie('CGISESSID'),
>             }),
>+            ( $params->{error} ? ( error => $params->{error} ) : () ),
>         );
> 
>     } elsif ( $op eq 'create' ) {
>@@ -100,19 +101,13 @@ if ( $backends_available ) {
>                 );
>                 $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
>-                );
>+                # Backend failure, redirect back to illview
>+                print $cgi->redirect( '/cgi-bin/koha/ill/ill-requests.pl'
>+                      . '?method=illview'
>+                      . '&illrequest_id='
>+                      . $request->id
>+                      . '&error=migrate_target' );
>+                exit;
>             }
>         }
>         else {
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>index 5f707fee52..63d58c7f46 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>@@ -502,6 +502,15 @@
> 
>                 [% ELSIF query_type == 'illview' %]
>                     [% req_status = request.status %]
>+
>+                    [% IF error %]
>+                      [% IF error == 'migrate_target' %]
>+                          <div class="alert">
>+                              The backend you tried to migrate to does not yet support migrations, please try again with an alternative target.
>+                          </div>
>+                      [% END %]
>+                    [% END %]
>+
>                     <h1>Manage ILL request</h1>
>                     <div id="request-toolbar" class="btn-toolbar">
>                         <a title="Edit request" id="ill-toolbar-btn-edit-action" class="btn btn-sm btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=edit_action&amp;illrequest_id=[% request.illrequest_id | html %]">
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 20640: 74903 | 75430 | 75431 | 78525 | 79508 | 79571 | 79597 | 80900 | 81826 | 81827 | 83777 | 83778 | 83779 | 83797 | 83798 | 83799 | 83800 | 83801 | 83803 | 83805 | 83806 | 83807 | 83808 | 83809 | 83810