diff options
| author | Takeshi Umeda <noel.yoshiba@gmail.com> | 2020-05-24 16:15:23 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-24 09:15:23 +0200 |
| commit | 8e056bd82e6d838aa525ece7a2d3a1cbcee2bcfe (patch) | |
| tree | 094ee9fae4854dd356fd5bb3c0d3cf07d6b121de | |
| parent | 51d8964b933b97bde420ea0d66088043c64dbeb6 (diff) | |
Fix csv upload (#13835)
| -rw-r--r-- | app/models/import.rb | 2 | ||||
| -rw-r--r-- | config/initializers/paperclip.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/models/import.rb b/app/models/import.rb index a7a0d8065..c78a04d07 100644 --- a/app/models/import.rb +++ b/app/models/import.rb @@ -17,7 +17,7 @@ # class Import < ApplicationRecord - FILE_TYPES = %w(text/plain text/csv).freeze + FILE_TYPES = %w(text/plain text/csv application/csv).freeze MODES = %i(merge overwrite).freeze self.inheritance_column = false diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb index 0dd7f8cf8..ebb009065 100644 --- a/config/initializers/paperclip.rb +++ b/config/initializers/paperclip.rb @@ -111,3 +111,5 @@ else url: ENV.fetch('PAPERCLIP_ROOT_URL', '/system') + '/:prefix_url:class/:attachment/:id_partition/:style/:filename', ) end + +Paperclip.options[:content_type_mappings] = { csv: Import::FILE_TYPES } |