X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7a537556b3503bf957ad3da2bf27885518a33230..4f552c0187f8c31d94ff74485c57ef7f9888597e:/services/api/app/controllers/arvados/v1/jobs_controller.rb diff --git a/services/api/app/controllers/arvados/v1/jobs_controller.rb b/services/api/app/controllers/arvados/v1/jobs_controller.rb index 07daf71eb6..40f2def5dc 100644 --- a/services/api/app/controllers/arvados/v1/jobs_controller.rb +++ b/services/api/app/controllers/arvados/v1/jobs_controller.rb @@ -6,11 +6,11 @@ class Arvados::V1::JobsController < ApplicationController skip_before_filter :render_404_if_no_object, :only => :queue def create - [:repository, :script, :script_version, :script_parameters].each do |r| + [:repository, :script, :script_version, :script_parameters].each do |r| if !resource_attrs[r] return render json: { :error => "#{r} attribute must be specified" - }, status: :unprocessable_entity + }, status: :unprocessable_entity end end @@ -26,8 +26,8 @@ class Arvados::V1::JobsController < ApplicationController Job.readable_by(current_user).where(script: resource_attrs[:script], script_version: r). each do |j| - if j.nondeterministic != true and - j.success != false and + if j.nondeterministic != true and + j.success != false and j.script_parameters == resource_attrs[:script_parameters] # Record the first job in the list if !@object @@ -49,7 +49,6 @@ class Arvados::V1::JobsController < ApplicationController end # Don't pass these on to activerecord - resource_attrs.delete(:repository) resource_attrs.delete(:minimum_script_version) resource_attrs.delete(:exclude_script_versions) resource_attrs.delete(:no_reuse) @@ -58,7 +57,7 @@ class Arvados::V1::JobsController < ApplicationController def cancel reload_object_before_update - @object.update_attributes cancelled_at: Time.now + @object.update_attributes! cancelled_at: Time.now show end