projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2221-complete-docker' (closes #2325, closes #2221)
[arvados.git]
/
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 b35bc4e44f8f38edb57c659ba2f21e84c12f05d2..178b48f173d58e47b5c590149d8b7f966b872dec 100644
(file)
--- 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
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"
if !resource_attrs[r]
return render json: {
:error => "#{r} attribute must be specified"
- }, status: :unprocessable_entity
+ }, status: :unprocessable_entity
end
end
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|
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
j.script_parameters == resource_attrs[:script_parameters]
# Record the first job in the list
if !@object