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

Ensure temp files deletion after export is done [SCI-2646]

Browse source
This commit is contained in:
Matej Zrimšek 2018-11-08 21:19:17 +01:00
parent 2f6a6072e1
commit b7fdd82409
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/models/team_zip_export.rb
View file

@ -30,10 +30,9 @@ class TeamZipExport < ZipExport
fill_content(dir_to_zip, data, type, options)
zip!(dir_to_zip, output_file.path)
self.zip_file = File.open(output_file)
if save
FileUtils.rm_rf([dir_to_zip, output_file], secure: true)
generate_notification(user)
end
generate_notification(user) if save
ensure
FileUtils.rm_rf([dir_to_zip, output_file], secure: true)
end
handle_asynchronously :generate_exportable_zip

7
app/models/zip_export.rb
View file

@ -60,10 +60,9 @@ class ZipExport < ApplicationRecord
fill_content(dir_to_zip, data, type, options)
zip!(dir_to_zip, output_file.path)
self.zip_file = File.open(output_file)
if save
FileUtils.rm_rf([dir_to_zip, output_file], secure: true)
generate_notification(user)
end
generate_notification(user) if save
ensure
FileUtils.rm_rf([dir_to_zip, output_file], secure: true)
end
handle_asynchronously :generate_exportable_zip