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

Improve code style 👮‍

Browse Source
This commit is contained in:
tobias.kantusch
2021-04-23 14:29:13 +02:00
committed by Sebastian Serth
parent 88aa25e9a0
commit b3c110cead
2 changed files with 67 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/controllers/concerns/submission_parameters.rb
View File

@ -1,16 +1,27 @@
# frozen_string_literal: true
module SubmissionParameters
include FileParameters
def submission_params
submission_params = params[:submission].present? ? params[:submission].permit(:cause, :exercise_id, files_attributes: file_attributes) : {}
submission_params = merge_user(submission_params)
files_attributes = submission_params[:files_attributes]
submission_params[:files_attributes] = reject_illegal_file_attributes(submission_params[:exercise_id].to_i, files_attributes)
submission_params
end
private :submission_params
def merge_user(params)
if current_user
current_user_id = current_user.id
current_user_class_name = current_user.class.name
end
# The study_group_id might not be present in the session (e.g. for internal users), resulting in session[:study_group_id] = nil which is intended.
submission_params = params[:submission].present? ? params[:submission].permit(:cause, :exercise_id, files_attributes: file_attributes).merge(user_id: current_user_id, user_type: current_user_class_name, study_group_id: session[:study_group_id]) : {}
files_attributes = submission_params[:files_attributes] || []
submission_params[:files_attributes] = reject_illegal_file_attributes(submission_params[:exercise_id].to_i, files_attributes)
submission_params
params.merge(
user_id: current_user_id,
user_type: current_user_class_name,
study_group_id: session[:study_group_id]
)
end
private :submission_params
end