Bugzilla – Attachment 68963 Details for
Bug 19420
Improve display of errors from failure of uploading file during stage import
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19420: (QA Follow-up) Change in error reporting affects upload.pl
Bug-19420-QA-Follow-up-Change-in-error-reporting-a.patch (text/plain), 1.55 KB, created by
Marcel de Rooy
on 2017-11-06 10:40:58 UTC
(
hide
)
Description:
Bug 19420: (QA Follow-up) Change in error reporting affects upload.pl
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2017-11-06 10:40:58 UTC
Size:
1.55 KB
patch
obsolete
>From f760687bbd6bd776284fdde35b791b9027b0d4ec Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Mon, 6 Nov 2017 11:28:46 +0100 >Subject: [PATCH] Bug 19420: (QA Follow-up) Change in error reporting affects > upload.pl >Content-Type: text/plain; charset=utf-8 > >The change from the first patch requires a similar change in upload.pl >when a few error codes are passed to the template. > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Tested by deleting a temporary file manually and downloading or deleting >the file from the upload search results. >--- > tools/upload.pl | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > >diff --git a/tools/upload.pl b/tools/upload.pl >index fd70b13..dafb8dd 100755 >--- a/tools/upload.pl >+++ b/tools/upload.pl >@@ -83,9 +83,9 @@ if ( $op eq 'new' ) { > my $delete = $rec ? $rec->delete : undef; > #TODO Improve error handling > my $msg = $delete >- ? JSON::to_json({ $fn => 6 }) >+ ? JSON::to_json({ $fn => { code => 6 }}) > : $id >- ? JSON::to_json({ $fn || $id, 7 }) >+ ? JSON::to_json({ $fn || $id, { code => 7 }}) > : ''; > $template->param( > mode => 'deleted', >@@ -100,7 +100,7 @@ if ( $op eq 'new' ) { > if ( !$rec || !$fh ) { > $template->param( > mode => 'new', >- msg => JSON::to_json( { $id => 5 } ), >+ msg => JSON::to_json({ $id => { code => 5 }}), > ); > output_html_with_http_headers $input, $cookie, $template->output; > } else { >-- >2.1.4
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 19420
:
67685
|
68292
|
68365
|
68909
|
68910
|
68941
|
68960
|
68961
|
68962
| 68963