Bugzilla – Attachment 83797 Details for
Bug 20640
Allow migrating a request between backends
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20640: (follow-up) Make error message translatable
Bug-20640-follow-up-Make-error-message-translatabl.patch (text/plain), 2.45 KB, created by
Martin Renvoize
on 2019-01-11 14:51:54 UTC
(
hide
)
Description:
Bug 20640: (follow-up) Make error message translatable
Filename:
MIME Type:
Creator:
Martin Renvoize
Created:
2019-01-11 14:51:54 UTC
Size:
2.45 KB
patch
obsolete
>From 21659b7ade9acc913e6c5c042143e5a495817de0 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 > >--- > ill/ill-requests.pl | 9 +++------ > .../intranet-tmpl/prog/en/modules/ill/ill-requests.tt | 9 +++++++++ > 2 files changed, 12 insertions(+), 6 deletions(-) > >diff --git a/ill/ill-requests.pl b/ill/ill-requests.pl >index 792b93d241..ed008c1e17 100755 >--- a/ill/ill-requests.pl >+++ b/ill/ill-requests.pl >@@ -103,15 +103,12 @@ if ( $backends_available ) { > # 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' >- } >+ next => 'illview' > }; > $template->param( > whole => $backend_result, >- request => $request >+ request => $request, >+ error => 'migrate_target' > ); > } > } >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&illrequest_id=[% request.illrequest_id | html %]"> >-- >2.19.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
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