projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
11308: Merge branch 'master' into 11308-python3
[arvados.git]
/
services
/
api
/
app
/
controllers
/
arvados
/
v1
/
pipeline_instances_controller.rb
diff --git
a/services/api/app/controllers/arvados/v1/pipeline_instances_controller.rb
b/services/api/app/controllers/arvados/v1/pipeline_instances_controller.rb
index 9781caf7e8183f618d33971335ed4d6e38a23ab3..c44c81a733d1f432f378cea58c25d3eb359bf32d 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/pipeline_instances_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/pipeline_instances_controller.rb
@@
-1,5
+1,11
@@
class Arvados::V1::PipelineInstancesController < ApplicationController
class Arvados::V1::PipelineInstancesController < ApplicationController
- accept_attribute_as_json :components_summary, Hash
accept_attribute_as_json :components, Hash
accept_attribute_as_json :properties, Hash
accept_attribute_as_json :components, Hash
accept_attribute_as_json :properties, Hash
+ accept_attribute_as_json :components_summary, Hash
+
+ def cancel
+ reload_object_before_update
+ @object.cancel cascade: params[:cascade]
+ show
+ end
end
end