From aeacde0ac7e38d0ca92f005fae36355aae740d3d Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Mon, 6 Nov 2017 11:28:46 +0100 Subject: [PATCH] Bug 19420: (QA Follow-up) Change in error reporting affects upload.pl 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 Tested by deleting a temporary file manually and downloading or deleting the file from the upload search results. Signed-off-by: Jonathan Druart --- tools/upload.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/upload.pl b/tools/upload.pl index fd70b13a02..dafb8dd39f 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.39.5