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

Add StudyGroup to submissions and show it for submissions and RfCs

Browse Source 
Also take care of deleting a StudyGroup for existing submissions
This commit is contained in:
Sebastian Serth
2019-02-14 18:09:21 +01:00
parent 532416b9d3
commit 6e03939c10
8 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,8 @@ module SubmissionParameters
current_user_id = current_user.id
current_user_class_name = current_user.class.name
end
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) : {}
# 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]) : {}
reject_illegal_file_attributes!(submission_params)
submission_params
end