Commit 6979dd0c authored by Kamil Trzciński's avatar Kamil Trzciński

Fix filename bug

parent 4804b612
...@@ -182,6 +182,15 @@ module ObjectStorage ...@@ -182,6 +182,15 @@ module ObjectStorage
end end
end end
# allow to configure and overwrite the filename
def filename
@filename || super || file&.filename # rubocop:disable Gitlab/ModuleWithInstanceVariables
end
def filename=(filename)
@filename = filename # rubocop:disable Gitlab/ModuleWithInstanceVariables
end
def file_storage? def file_storage?
storage.is_a?(CarrierWave::Storage::File) storage.is_a?(CarrierWave::Storage::File)
end end
...@@ -341,15 +350,6 @@ module ObjectStorage ...@@ -341,15 +350,6 @@ module ObjectStorage
self.store!(UploadedFile.new(file_path, filename)) self.store!(UploadedFile.new(file_path, filename))
end end
# allow to configure and overwrite the filename
def filename
@filename || super || file&.filename # rubocop:disable Gitlab/ModuleWithInstanceVariables
end
def filename=(filename)
@filename = filename # rubocop:disable Gitlab/ModuleWithInstanceVariables
end
# this is a hack around CarrierWave. The #migrate method needs to be # this is a hack around CarrierWave. The #migrate method needs to be
# able to force the current file to the migrated file upon success. # able to force the current file to the migrated file upon success.
def file=(file) def file=(file)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment