Present all pipeline triggers using trigger presenter

This commit is contained in:
Grzegorz Bizon 2018-12-19 15:51:02 +01:00 committed by Yorick Peterse
parent 084b7edb17
commit 7327fb4aa7
No known key found for this signature in database
GPG Key ID: EDD30D2BEB691AC9
3 changed files with 6 additions and 4 deletions

View File

@ -99,7 +99,9 @@ module Projects
def define_triggers_variables
@triggers = @project.triggers
.present(current_user: current_user)
@trigger = ::Ci::Trigger.new
.present(current_user: current_user)
end
def define_badges_variables

View File

@ -30,7 +30,7 @@ module Ci
end
def short_token
token[0...4]
token[0...4] if token.present?
end
def legacy?

View File

@ -85,7 +85,7 @@ module API
declared_params(include_missing: false).merge(owner: current_user))
if trigger.valid?
present trigger, with: Entities::Trigger
present trigger, with: Entities::Trigger, current_user: current_user
else
render_validation_error!(trigger)
end
@ -106,7 +106,7 @@ module API
break not_found!('Trigger') unless trigger
if trigger.update(declared_params(include_missing: false))
present trigger, with: Entities::Trigger
present trigger, with: Entities::Trigger, current_user: current_user
else
render_validation_error!(trigger)
end
@ -127,7 +127,7 @@ module API
if trigger.update(owner: current_user)
status :ok
present trigger, with: Entities::Trigger
present trigger, with: Entities::Trigger, current_user: current_user
else
render_validation_error!(trigger)
end