diff options
author | Gannon McGibbon <gannon.mcgibbon@gmail.com> | 2019-07-31 18:44:58 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-31 18:44:58 -0400 |
commit | 388e011b0828216c4bc51c2af5d0e1cc0fd9d314 (patch) | |
tree | 8fef22428a9f198a2abe21716e421d1b49ae0423 /activestorage/lib/active_storage/service | |
parent | f66bfdb2841bedda0f92f573fb2e5e894c35c7ed (diff) | |
parent | 24ae11daaee40048401f79d3c5541d47bf04926d (diff) | |
download | rails-388e011b0828216c4bc51c2af5d0e1cc0fd9d314.tar.gz rails-388e011b0828216c4bc51c2af5d0e1cc0fd9d314.tar.bz2 rails-388e011b0828216c4bc51c2af5d0e1cc0fd9d314.zip |
Merge pull request #36792 from peterzhu2118/azure-content-disposition
Upload filename and disposition for Azure
Diffstat (limited to 'activestorage/lib/active_storage/service')
-rw-r--r-- | activestorage/lib/active_storage/service/azure_storage_service.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activestorage/lib/active_storage/service/azure_storage_service.rb b/activestorage/lib/active_storage/service/azure_storage_service.rb index 8d77e9b20f..0648da70b5 100644 --- a/activestorage/lib/active_storage/service/azure_storage_service.rb +++ b/activestorage/lib/active_storage/service/azure_storage_service.rb @@ -17,10 +17,12 @@ module ActiveStorage @container = container end - def upload(key, io, checksum: nil, content_type: nil, **) + def upload(key, io, checksum: nil, filename: nil, content_type: nil, disposition: nil, **) instrument :upload, key: key, checksum: checksum do handle_errors do - blobs.create_block_blob(container, key, IO.try_convert(io) || io, content_md5: checksum, content_type: content_type) + content_disposition = content_disposition_with(filename: filename, type: disposition) if disposition && filename + + blobs.create_block_blob(container, key, IO.try_convert(io) || io, content_md5: checksum, content_type: content_type, content_disposition: content_disposition) end end end |