diff options
author | Eugen <eugen@zeonfederated.com> | 2017-04-18 23:15:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-18 23:15:44 +0200 |
commit | e09ab2c0bdc0822886fa98b0019d4a447a2ee0d6 (patch) | |
tree | 200e0b252beaf08b94c497ced036fea120422912 /app/models/media_attachment.rb | |
parent | 6bd101923567a7302c2b734317791f941ce53cdf (diff) |
Fix #1642, fix #1912 - Dictate content-type file extension (#2078)
* Fix #1642, fix #1912 - Previous change (#1718) did not modify how original file was saved on upload * Fix for when file is missing
Diffstat (limited to 'app/models/media_attachment.rb')
-rw-r--r-- | app/models/media_attachment.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index 85e82e12b..ec1808790 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -50,7 +50,7 @@ class MediaAttachment < ApplicationRecord end before_create :set_shortcode - before_post_process :set_type + before_post_process :set_type_and_extension class << self private @@ -103,7 +103,13 @@ class MediaAttachment < ApplicationRecord end end - def set_type + def set_type_and_extension self.type = VIDEO_MIME_TYPES.include?(file_content_type) ? :video : :image + + unless file.blank? + extension = Paperclip::Interpolations.content_type_extension(file, :original) + basename = Paperclip::Interpolations.basename(file, :original) + file.instance_write :file_name, [basename, extension].delete_if(&:empty?).join('.') + end end end |