projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch '4031-fix-graph-connections' closes #4031
[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 2a123951bcf5e3ac5c9e7badecdada5958a41d21..e2bef88548fbc8ddab4848e3937d089ac3c62bd5 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/jobs_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/jobs_controller.rb
@@
-96,7
+96,12
@@
class Arvados::V1::JobsController < ApplicationController
def cancel
reload_object_before_update
- @object.update_attributes! cancelled_at: Time.now
+ @object.update_attributes! state: Job::Cancelled
+ show
+ end
+
+ def lock
+ @object.lock current_user.uuid
show
end