@@ -, +, @@
and try to upload to a category. Correct error message?
Correct error message the second time?
---
Koha/Uploader.pm | 14 ++++---
.../intranet-tmpl/prog/en/modules/tools/upload.tt | 43 +++++++++++++++-------
t/db_dependent/Upload.t | 2 +-
tools/upload.pl | 10 +++--
4 files changed, 47 insertions(+), 22 deletions(-)
--- a/Koha/Uploader.pm
+++ a/Koha/Uploader.pm
@@ -58,8 +58,12 @@ Koha::Uploader - Facilitate file uploads (temporary and permanent)
=cut
-use constant KOHA_UPLOAD => 'koha_upload';
+use constant KOHA_UPLOAD => 'koha_upload';
use constant BYTES_DIGEST => 2048;
+use constant ERRCODE_1 => 'UPLERR_ALREADY_EXISTS';
+use constant ERRCODE_2 => 'UPLERR_CANNOT_WRITE';
+use constant ERRCODE_3 => 'UPLERR_NO_ROOT_DIR';
+use constant ERRCODE_4 => 'UPLERR_NO_TEMP_DIR';
use Modern::Perl;
use CGI; # no utf8 flag, since it may interfere with binary uploads
@@ -220,9 +224,9 @@ sub _create_file {
$self->{files}->{$filename}->{errcode} ) {
#skip
} elsif( !$self->{temporary} && !$self->{rootdir} ) {
- $self->{files}->{$filename}->{errcode} = 3; #no rootdir
+ $self->{files}->{$filename}->{errcode} = ERRCODE_3; #no rootdir
} elsif( $self->{temporary} && !$self->{tmpdir} ) {
- $self->{files}->{$filename}->{errcode} = 4; #no tempdir
+ $self->{files}->{$filename}->{errcode} = ERRCODE_4; #no tempdir
} else {
my $dir = $self->_dir;
my $hashval = $self->{files}->{$filename}->{hash};
@@ -235,7 +239,7 @@ sub _create_file {
hashvalue => $hashval,
uploadcategorycode => $self->{category},
})->count ) {
- $self->{files}->{$filename}->{errcode} = 1; #already exists
+ $self->{files}->{$filename}->{errcode} = ERRCODE_1; #already exists
return;
}
@@ -244,7 +248,7 @@ sub _create_file {
$fh->binmode;
$self->{files}->{$filename}->{fh}= $fh;
} else {
- $self->{files}->{$filename}->{errcode} = 2; #not writable
+ $self->{files}->{$filename}->{errcode} = ERRCODE_2; #not writable
}
}
return $fh;
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
@@ -248,18 +248,6 @@
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'datatables.inc' %]
-