diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-10-09 07:10:46 +0200 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-02-20 23:25:39 -0600 |
| commit | 95e88ba4347a8c2d2aa3ee8762b32d524e5629a2 (patch) | |
| tree | fd889fc67708e384cc661a0295db1f47f8c29a1c /config | |
| parent | a373fdc1c3b1e6646ffc243f3f5bd926aeda041f (diff) | |
port tootsuite/#12125 to monsterfork: Fix attachment not being re-downloaded even if file is not stored
Change the behaviour of remotable concern. Previously, it would skip downloading an attachment if the stored remote URL is identical to the new one. Now it would not be skipped if the attachment is not actually currently stored by Paperclip.
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/paperclip.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb index 9ebb41ec2..5eec70d62 100644 --- a/config/initializers/paperclip.rb +++ b/config/initializers/paperclip.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -Paperclip::DataUriAdapter.register - Paperclip.interpolates :filename do |attachment, style| if style == :original attachment.original_filename @@ -91,7 +89,7 @@ else Paperclip::Attachment.default_options.merge!( storage: :filesystem, use_timestamp: true, - path: File.join(ENV.fetch('PAPERCLIP_ROOT_PATH', File.join(':rails_root', 'public', 'system')), ':class', ':attachment', ':id_partition', ':style', ':filename'), + path: ENV.fetch('PAPERCLIP_ROOT_PATH', ':rails_root/public/system') + '/:class/:attachment/:id_partition/:style/:filename', url: ENV.fetch('PAPERCLIP_ROOT_URL', '/system') + '/:class/:attachment/:id_partition/:style/:filename', ) end |