merge master

2022-08-20 22:20:52 +02:00
parent 6094767a65 6208d8b7ea
commit 3effdbe600
291 changed files with 5413 additions and 9429 deletions
--- a/app/services/proforma_service/convert_exercise_to_task.rb
+++ b/app/services/proforma_service/convert_exercise_to_task.rb
@ -126,11 +126,11 @@ module ProformaService

    def add_content_to_task_file(file, task_file)
      if file.native_file.present?
-        file = ::File.new(file.native_file.file.path, 'r')
-        task_file.content = file.read
+        file_content = file.read
+        task_file.content = file_content
        task_file.used_by_grader = false
        task_file.binary = true
-        task_file.mimetype = MimeMagic.by_magic(file).type
+        task_file.mimetype = MimeMagic.by_magic(file_content).type
      else
        task_file.content = file.content
        task_file.used_by_grader = true