From fb8c49db8b16e45a33cff2839390bcbaab262075 Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Fri, 7 Apr 2017 19:28:04 +0900 Subject: [PATCH] create_params and update_params into trigger_params --- app/controllers/projects/triggers_controller.rb | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/app/controllers/projects/triggers_controller.rb b/app/controllers/projects/triggers_controller.rb index 4f5d336ce40..c1fc40f75d7 100644 --- a/app/controllers/projects/triggers_controller.rb +++ b/app/controllers/projects/triggers_controller.rb @@ -11,7 +11,7 @@ class Projects::TriggersController < Projects::ApplicationController end def create - @trigger = project.triggers.create(create_params.merge(owner: current_user)) + @trigger = project.triggers.create(trigger_params.merge(owner: current_user)) if @trigger.valid? flash[:notice] = 'Trigger was created successfully.' @@ -37,7 +37,7 @@ class Projects::TriggersController < Projects::ApplicationController end def update - if trigger.update(update_params) + if trigger.update(trigger_params) redirect_to namespace_project_settings_ci_cd_path(@project.namespace, @project), notice: 'Trigger was successfully updated.' else render action: "edit" @@ -68,17 +68,10 @@ class Projects::TriggersController < Projects::ApplicationController @trigger ||= project.triggers.find(params[:id]) || render_404 end - def create_params + def trigger_params params.require(:trigger).permit( :description, :ref, - trigger_schedule_attributes: [ :cron, :cron_timezone, :_destroy ] - ) - end - - def update_params - params.require(:trigger).permit( - :description, :ref, - trigger_schedule_attributes: [ :cron, :cron_timezone, :_destroy ] + trigger_schedule_attributes: [:cron, :cron_timezone, :_destroy] ) end end