From 2878dbfad66ddb8c2581f0b8ee89acc0fd437c5d Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Thu, 12 Nov 2020 19:35:35 +0100 Subject: [PATCH] Show proper filename in error messages after upload --- app/controllers/packages_controller.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/packages_controller.rb b/app/controllers/packages_controller.rb index 0ed78d6..eae8a13 100644 --- a/app/controllers/packages_controller.rb +++ b/app/controllers/packages_controller.rb @@ -55,7 +55,7 @@ class PackagesController < ApplicationController params[:file].each do |img| # Log.log "Uploaded img=#{img.path}" new_screenshot = @package.screenshots.new(simage: img) - + # BUG: ActiveStorage will accept the broken PNG during upload! # Check if the image was valid @@ -79,18 +79,17 @@ class PackagesController < ApplicationController new_screenshot.save! Log.log "Screenshot #{new_screenshot.id} uploaded successfully. ip=#{session[:ip]}. user-token=#{session[:token]}. user-name=#{current_user}" - @valid_images.push new_screenshot else Log.log "Screenshot #{new_screenshot.image_file_name} invalid (#{new_screenshot.errors[:image]})." - @invalid_images.push new_screenshot + @invalid_images.push new_screenshot.original_filename end end errors = [] @invalid_images.each do |image| # errors << "The image #{image.image_file_name} #{image.errors[:image].join(' and ')}." - errors << "That file #{image.image_file_name} is not valid." + errors << "The file #{image} is not valid." flash[:error] = errors.join(" ") end