Fix user archive takeout when using OpenStack Swift or S3 providers with no ACL support (#24200)

This commit is contained in:
Claire authored and GitHub committed 2023-03-27 17:07:37 +02:00
1 parent ddb769f0b8
commit e084b5b82d
3 files changed
+7 -2

No files matched your search

+5 -1
View File
@@ -13,7 +13,11 @@ class BackupsController < ApplicationController
when :s3
redirect_to @backup.dump.expiring_url(10)
when :fog
redirect_to @backup.dump.expiring_url(Time.now.utc + 10)
if Paperclip::Attachment.default_options.dig(:storage, :fog_credentials, :openstack_temp_url_key).present?
redirect_to @backup.dump.expiring_url(Time.now.utc + 10)
else
redirect_to full_asset_url(@backup.dump.url)
end
when :filesystem
redirect_to full_asset_url(@backup.dump.url)
end