htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clarify set_file and set_files in SubmissionsController

Browse Source
This commit is contained in:
Sebastian Serth
2021-10-17 16:19:56 +02:00
parent 21e0571838
commit 2377f8370c
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/controllers/submissions_controller.rb
View File

@@ -7,9 +7,9 @@ class SubmissionsController < ApplicationController
include SubmissionParameters
include Tubesock::Hijack
before_action :set_submission, only: %i[download download_file render_file run score show statistics]
before_action :set_files, only: %i[download download_file render_file show run]
before_action :set_file, only: %i[download_file render_file run]
before_action :set_submission, only: %i[download download_file render_file run score show statistics test]
before_action :set_files, only: %i[download show]
before_action :set_files_and_specific_file, only: %i[download_file render_file run test]
before_action :set_mime_type, only: %i[download_file render_file]
skip_before_action :verify_authenticity_token, only: %i[download_file render_file]
@@ -130,7 +130,7 @@ class SubmissionsController < ApplicationController
end
@output = +''
durations = @submission.run(sanitize_filename) do |socket|
durations = @submission.run(@file) do |socket|
runner_socket = socket
client_socket.send_data JSON.dump({cmd: :status, status: :container_running})
@@ -309,7 +309,10 @@ class SubmissionsController < ApplicationController
end
end
def set_file
def set_files_and_specific_file
# @files contains all visible files for the user
# @file contains the specific file requested for run / test / render / ...
set_files
@file = @files.detect {|file| file.name_with_extension == sanitize_filename }
head :not_found unless @file
end