From 93a123f25a82c6df0f8713a7b2acc90ab758c59b Mon Sep 17 00:00:00 2001 From: p31729568 Date: Thu, 26 Sep 2019 14:51:36 +0800 Subject: [PATCH 1/2] fix --- .../ecs/requirement_support_objectives_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/ecs/requirement_support_objectives_controller.rb b/app/controllers/ecs/requirement_support_objectives_controller.rb index 2fe8cc338..d06dbe568 100644 --- a/app/controllers/ecs/requirement_support_objectives_controller.rb +++ b/app/controllers/ecs/requirement_support_objectives_controller.rb @@ -36,12 +36,12 @@ class Ecs::RequirementSupportObjectivesController < Ecs::BaseController private def check_record_exists! - unless current_year.ec_graduation_requirements.exists?(id: params[:graduation_requirement_id]) + unless current_year.ec_graduation_requirements.exists?(id: params[:ec_graduation_requirement_id]) render_not_found return end - unless current_year.ec_training_subitems.exists?(id: params[:training_subitem_id]) + unless current_year.ec_training_subitems.exists?(id: params[:ec_training_subitem_id]) render_not_found return end From 3f637947f8532282a11166abc8fb5095b2872d9a Mon Sep 17 00:00:00 2001 From: p31729568 Date: Thu, 26 Sep 2019 15:05:27 +0800 Subject: [PATCH 2/2] ecs: fix --- .../ecs/requirement_support_objectives_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/ecs/requirement_support_objectives_controller.rb b/app/controllers/ecs/requirement_support_objectives_controller.rb index d06dbe568..1abc5994f 100644 --- a/app/controllers/ecs/requirement_support_objectives_controller.rb +++ b/app/controllers/ecs/requirement_support_objectives_controller.rb @@ -48,6 +48,8 @@ class Ecs::RequirementSupportObjectivesController < Ecs::BaseController end def permit_params - params.require(%i[ec_graduation_requirement_id ec_training_subitem_id]) + hash = params.permit(%i[ec_graduation_requirement_id ec_training_subitem_id]) + hash[:ec_training_objective_id] = hash.delete(:ec_training_subitem_id) + hash end end \ No newline at end of file