Bugzilla – Attachment 75305 Details for
Bug 20428
MARC import fails on Debian Stretch
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20428: Display warning if the entry is empty
Bug-20428-Display-warning-if-the-entry-is-empty.patch (text/plain), 2.12 KB, created by
Jonathan Druart
on 2018-05-14 14:13:28 UTC
(
hide
)
Description:
Bug 20428: Display warning if the entry is empty
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2018-05-14 14:13:28 UTC
Size:
2.12 KB
patch
obsolete
>From c6489c1ccd48de558a5b241d6b1b45dd08c5d519 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Mon, 14 May 2018 11:11:34 -0300 >Subject: [PATCH] Bug 20428: Display warning if the entry is empty > >And not only if the entry is missing. We should do the same for other >entries. >Also, use Koha::UploadedFile->temporary_directory to know the fallback >value. >--- > about.pl | 8 +++++--- > koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 2 +- > 2 files changed, 6 insertions(+), 4 deletions(-) > >diff --git a/about.pl b/about.pl >index 308737debd..70900dd2c4 100755 >--- a/about.pl >+++ b/about.pl >@@ -47,6 +47,7 @@ use Koha::Caches; > use Koha::Config::SysPrefs; > use Koha::Illrequest::Config; > use Koha::SearchEngine::Elasticsearch; >+use Koha::UploadedFiles; > > use C4::Members::Statistics; > >@@ -261,10 +262,11 @@ if ( ! defined C4::Context->config('upload_path') ) { > } > } > >-if ( ! defined C4::Context->config('tmp_path') ) { >+if ( ! C4::Context->config('tmp_path') ) { >+ my $temporary_directory = Koha::UploadedFile->temporary_directory; > push @xml_config_warnings, { >- error => 'tmp_path_entry_missing', >- effective_tmp_dir => File::Spec->tmpdir >+ error => 'tmp_path_missing', >+ effective_tmp_dir => $temporary_directory, > } > } > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >index a3e7bf74e6..6c67f27e5f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >@@ -414,7 +414,7 @@ > Also note that you need to properly set the OPACBaseURL preference for the file upload plugin to work. > </td> > </tr> >- [% ELSIF config_entry.error == 'tmp_path_entry_missing' %] >+ [% ELSIF config_entry.error == 'tmp_path_missing' %] > <tr> > <th scope="row"><b>Warning</b></th> > <td>You are missing the <tmp_path> entry in your koha-conf.xml file. Please >-- >2.11.0
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 20428
:
73426
|
73427
|
73428
|
73429
|
73430
|
73431
|
75159
|
75160
|
75161
|
75162
|
75163
|
75164
|
75169
|
75170
|
75171
|
75172
|
75275
|
75279
|
75280
|
75281
|
75282
|
75283
|
75286
|
75293
|
75294
|
75295
|
75296
|
75297
|
75298
| 75305