Merge branch 'master' into refactor_proforma_import_export

# Conflicts: # spec/controllers/exercises_controller_spec.rb
2022-01-11 22:20:18 +01:00
parent 3260d8f82f 4e56ecea70
commit c5c47715b3
122 changed files with 1558 additions and 1424 deletions
--- a/app/services/proforma_service/convert_task_to_exercise.rb
+++ b/app/services/proforma_service/convert_task_to_exercise.rb
@ -40,9 +40,9 @@ module ProformaService
    end

    def task_files
-      @task_files ||= @task.all_files.reject {|file| file.id == 'ms-placeholder-file' }.map do |task_file|
+      @task_files ||= @task.all_files.reject {|file| file.id == 'ms-placeholder-file' }.to_h do |task_file|
        [task_file.id, codeocean_file_from_task_file(task_file)]
-      end.to_h
+      end
    end

    def codeocean_file_from_task_file(file)