suzanne.soy/travis-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use only params[:id]

Browse Source
This commit is contained in:
Ana Rosas 2016-05-27 17:52:55 +02:00
parent 00bae7a945
commit 68daabafa0
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/travis/api/app/endpoint/builds.rb
View File

@ -23,7 +23,7 @@ class Travis::Api::App
Metriks.meter("api.request.cancel_build").mark Metriks.meter("api.request.cancel_build").mark
if Travis::Features.owner_active?(:enqueue_to_hub, current_user) if Travis::Features.owner_active?(:enqueue_to_hub, current_user)
service = Travis::Enqueue::Services::CancelModel.new(current_user, { build_id: params[:id] }) service = Travis::Enqueue::Services::CancelModel.new(current_user, { id: params[:id], type: :build })
else else
service = self.service(:cancel_build, params.merge(source: 'api')) service = self.service(:cancel_build, params.merge(source: 'api'))
end end

2
lib/travis/api/app/endpoint/jobs.rb
View File

@ -30,7 +30,7 @@ class Travis::Api::App
Metriks.meter("api.request.cancel_job").mark Metriks.meter("api.request.cancel_job").mark
if Travis::Features.owner_active?(:enqueue_to_hub, current_user) if Travis::Features.owner_active?(:enqueue_to_hub, current_user)
service = Travis::Enqueue::Services::CancelModel.new(current_user, { job_id: params[:id] }) service = Travis::Enqueue::Services::CancelModel.new(current_user, { id: params[:id], type: :job })
else else
service = self.service(:cancel_job, params.merge(source: 'api')) service = self.service(:cancel_job, params.merge(source: 'api'))
end end

6
lib/travis/api/enqueue/services/cancel_model.rb
View File

@ -32,14 +32,14 @@ module Travis
end end
def type def type
@type ||= @params[:build_id] ? :build : :job @params[:type]
end end
def target def target
if type == :build if type == :build
@target = Build.find(@params[:build_id]) @target = Build.find(@params[:id])
else else
@target = Job.find(@params[:job_id]) @target = Job.find(@params[:id])
end end
end end