kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

create_params and update_params into trigger_params

This commit is contained in:
Shinya Maeda 2017-04-07 19:28:04 +09:00 committed by Kamil Trzcinski
parent 2f5095c254
commit fb8c49db8b
No known key found for this signature in database
GPG Key ID: 4505F5C7E12C6A5A
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/controllers/projects/triggers_controller.rb
View File

@ -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