diff --git a/app/models/learning_object.rb b/app/models/learning_object.rb index 215295c7c27839db3598515b25e495c264637724..547636e65042441f8d31476de95badba19596e55 100644 --- a/app/models/learning_object.rb +++ b/app/models/learning_object.rb @@ -124,10 +124,12 @@ class LearningObject < ApplicationRecord at = attachments.where("name LIKE '%.mp4'").first return at unless at.nil? end - at = attachments.find_by(bundle_name: 'ORIGINAL') - at = attachments.first if at.nil? - update(attachment: at) - return attachment + at = attachments.where("name NOT LIKE '%.torrent' AND bundle_name = 'ORIGINAL'") + # at = attachments.first if at.nil? + unless at.blank? + update(attachment: at.first) + return attachment + end end nil end diff --git a/app/workers/package_worker.rb b/app/workers/package_worker.rb index 20a2fd34b9e9a7c5ef3615d4291c8f08308c48f3..4e2130da73ad7b4d46ba529b6b9a8c0a457eb61f 100644 --- a/app/workers/package_worker.rb +++ b/app/workers/package_worker.rb @@ -70,6 +70,7 @@ class PackageWorker Zip::File.open(PackageService.file_root(filename), Zip::File::CREATE) do |zipfile| files.each { |file| zipfile.add(File.basename(file.path), file.path) } end + FileUtils.chown_R 'portalmec', 'portalmec', PackageService.file_root.to_s, verbose: true rescue => e file = PackageService.file_root(filename) FileUtils.rm(file) if File.exist?(file)