Merge pull request #204 from openHPI/fix/save-exercise-collections

Fix saving new exercise collections with exercises
This commit is contained in:
rteusner
2018-08-22 14:22:00 +02:00
committed by GitHub
3 changed files with 8 additions and 6 deletions

View File

@ -17,9 +17,10 @@ class ExerciseCollectionsController < ApplicationController
end end
def create def create
@exercise_collection = ExerciseCollection.new(exercise_collection_params) @exercise_collection = ExerciseCollection.new
authorize! authorize!
create_and_respond(object: @exercise_collection) @exercise_collection.save
update_and_respond(object: @exercise_collection, params: exercise_collection_params)
end end
def destroy def destroy
@ -31,6 +32,7 @@ class ExerciseCollectionsController < ApplicationController
end end
def update def update
authorize!
update_and_respond(object: @exercise_collection, params: exercise_collection_params) update_and_respond(object: @exercise_collection, params: exercise_collection_params)
end end

View File

@ -14,8 +14,8 @@ class Exercise < ActiveRecord::Base
has_and_belongs_to_many :proxy_exercises has_and_belongs_to_many :proxy_exercises
has_many :user_proxy_exercise_exercises has_many :user_proxy_exercise_exercises
has_many :exercise_collection_items has_many :exercise_collection_items, dependent: :delete_all
has_many :exercise_collections, through: :exercise_collection_items has_many :exercise_collections, through: :exercise_collection_items, inverse_of: :exercises
has_many :user_exercise_interventions has_many :user_exercise_interventions
has_many :interventions, through: :user_exercise_interventions has_many :interventions, through: :user_exercise_interventions
has_many :exercise_tags has_many :exercise_tags

View File

@ -1,9 +1,9 @@
class ExerciseCollection < ActiveRecord::Base class ExerciseCollection < ActiveRecord::Base
include TimeHelper include TimeHelper
has_many :exercise_collection_items has_many :exercise_collection_items, dependent: :delete_all
alias_method :items, :exercise_collection_items alias_method :items, :exercise_collection_items
has_many :exercises, through: :exercise_collection_items has_many :exercises, through: :exercise_collection_items, inverse_of: :exercise_collections
belongs_to :user, polymorphic: true belongs_to :user, polymorphic: true
def collection_statistics def collection_statistics