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

Merge remote-tracking branch 'origin/master' into feature/more-statistics

Browse Source
This commit is contained in:
Maximilian Grundke
2018-03-14 14:41:38 +01:00
parent 0564c88105 6b91df092a
commit 593e9f520f
28 changed files with 580 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/exercise_collections_controller.rb
View File

@ -10,6 +10,7 @@ class ExerciseCollectionsController < ApplicationController
end
def show
@exercises = @exercise_collection.exercises.paginate(:page => params[:page])
end
def new
@ -55,6 +56,6 @@ class ExerciseCollectionsController < ApplicationController
end
def exercise_collection_params
params[:exercise_collection].permit(:name, :exercise_ids => [])
params[:exercise_collection].permit(:name, :use_anomaly_detection, :user_id, :user_type, :exercise_ids => []).merge(user_type: InternalUser.name)
end
end