diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2022-10-28 23:30:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-28 23:30:44 +0200 |
| commit | 317ec06dc791bfbd9eb86177b3027ca92d683b8b (patch) | |
| tree | c3134c01965b5b30f264b78e00c04a84d0abfb1b | |
| parent | 5fa340931e2bd39a4bcccc9a97ad58e13a2d56ab (diff) | |
Fix error when uploading malformed CSV import (#19509)
| -rw-r--r-- | app/validators/import_validator.rb | 2 | ||||
| -rw-r--r-- | config/locales/activerecord.en.yml | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/validators/import_validator.rb b/app/validators/import_validator.rb index 9f19aee2a..cbad56df6 100644 --- a/app/validators/import_validator.rb +++ b/app/validators/import_validator.rb @@ -26,6 +26,8 @@ class ImportValidator < ActiveModel::Validator when 'following' validate_following_import(import, row_count) end + rescue CSV::MalformedCSVError + import.errors.add(:data, :malformed) end private diff --git a/config/locales/activerecord.en.yml b/config/locales/activerecord.en.yml index 2dfa3b955..8aee15659 100644 --- a/config/locales/activerecord.en.yml +++ b/config/locales/activerecord.en.yml @@ -29,6 +29,10 @@ en: attributes: website: invalid: is not a valid URL + import: + attributes: + data: + malformed: is malformed status: attributes: reblog: |