Merge branch '8784-dir-listings'

[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 243f38b78cd74740e57a64f1cefe070eb0be6686..23c059cfbdae11f98ed40f75e79d33b2102c41be 100644 (file)
--- a/services/api/app/controllers/arvados/v1/jobs_controller.rb
+++ b/services/api/app/controllers/arvados/v1/jobs_controller.rb
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 class Arvados::V1::JobsController < ApplicationController
   accept_attribute_as_json :components, Hash
   accept_attribute_as_json :script_parameters, Hash
@@ -46,7 +50,7 @@ class Arvados::V1::JobsController < ApplicationController
 
   def cancel
     reload_object_before_update
-    @object.update_attributes! state: Job::Cancelled
+    @object.cancel cascade: params[:cascade]
     show
   end