luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-22 06:43:19 +00:00
Code Issues Projects Releases Wiki Activity

Fix error when uploading malformed CSV import (#19509)

Browse source
This commit is contained in:
Eugen Rochko 2022-10-28 23:30:44 +02:00 committed by GitHub
parent 5fa340931e
commit 317ec06dc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/validators/import_validator.rb
View file

@ -26,6 +26,8 @@ class ImportValidator < ActiveModel::Validator
when 'following' when 'following'
validate_following_import(import, row_count) validate_following_import(import, row_count)
end end
rescue CSV::MalformedCSVError
import.errors.add(:data, :malformed)
end end
private private

4
config/locales/activerecord.en.yml
View file

@ -29,6 +29,10 @@ en:
attributes: attributes:
website: website:
invalid: is not a valid URL invalid: is not a valid URL
import:
attributes:
data:
malformed: is malformed
status: status:
attributes: attributes:
reblog: reblog: