chaas/debshots
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Show proper filename in error messages after upload

Browse source
This commit is contained in:
Christoph Haas 2020-11-12 19:35:35 +01:00
parent b921a832b4
commit 2878dbfad6
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/packages_controller.rb
View file

@ -79,18 +79,17 @@ class PackagesController < ApplicationController
new_screenshot.save! new_screenshot.save!
Log.log "Screenshot #{new_screenshot.id} uploaded successfully. ip=#{session[:ip]}. user-token=#{session[:token]}. user-name=#{current_user}" Log.log "Screenshot #{new_screenshot.id} uploaded successfully. ip=#{session[:ip]}. user-token=#{session[:token]}. user-name=#{current_user}"
@valid_images.push new_screenshot @valid_images.push new_screenshot
else else
Log.log "Screenshot #{new_screenshot.image_file_name} invalid (#{new_screenshot.errors[:image]})." 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
end end
errors = [] errors = []
@invalid_images.each do |image| @invalid_images.each do |image|
# errors << "The image #{image.image_file_name} #{image.errors[:image].join(' and ')}." # 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(" ") flash[:error] = errors.join(" ")
end end