scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-05 22:44:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix export all with active storage

Browse source 
Close SCI-3924
This commit is contained in:
Jure Grabnar 2019-09-26 16:01:30 +02:00
parent c748513ca9
commit 668f902570
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/models/team_zip_export.rb
View file

@ -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