From 668f90257015831fbc8f0823ffb06996ded25d0f Mon Sep 17 00:00:00 2001 From: Jure Grabnar Date: Thu, 26 Sep 2019 16:01:30 +0200 Subject: [PATCH] Fix export all with active storage Close SCI-3924 --- app/models/team_zip_export.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/models/team_zip_export.rb b/app/models/team_zip_export.rb index b741365a7..96c8b64e2 100644 --- a/app/models/team_zip_export.rb +++ b/app/models/team_zip_export.rb @@ -13,14 +13,14 @@ class TeamZipExport < ZipExport File.join(Rails.root, "tmp/temp_zip_#{Time.now.to_i}") ).first zip_dir = FileUtils.mkdir_p(File.join(Rails.root, 'tmp/zip-ready')).first - zip_file = File.new( - File.join(zip_dir, - "projects_export_#{Time.now.strftime('%F_%H-%M-%S_UTC')}.zip"), - 'w+' - ) + + zip_name = "projects_export_#{Time.now.strftime('%F_%H-%M-%S_UTC')}.zip" + full_zip_name = File.join(zip_dir, zip_name) + zip_file = File.new(full_zip_name, 'w+') + fill_content(zip_input_dir, data, type, options) zip!(zip_input_dir, zip_file) - self.zip_file = File.open(zip_file) + self.zip_file.attach(io: File.open(zip_file), filename: zip_name) generate_notification(user) if save ensure FileUtils.rm_rf([zip_input_dir, zip_file], secure: true) @@ -201,7 +201,7 @@ class TeamZipExport < ZipExport elsif type == :result name = "#{directory}/#{append_file_suffix(asset.file_name, "_#{i}")}" end - asset.file.copy_to_local_file(:original, name) if asset.file.exists? + File.open(name, 'wb') { |f| f.write(asset.file.download) } if asset.file.attached? asset_indexes[asset.id] = name end