projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '9277-trash-container-outputs' closes #9277
[arvados.git]
/
apps
/
workbench
/
app
/
models
/
container_work_unit.rb
diff --git
a/apps/workbench/app/models/container_work_unit.rb
b/apps/workbench/app/models/container_work_unit.rb
index 88aab306cedc8b9ea5a8a94a27cc394f2022780b..ed82f18036c1025bffb16e5267701045039bb167 100644
(file)
--- a/
apps/workbench/app/models/container_work_unit.rb
+++ b/
apps/workbench/app/models/container_work_unit.rb
@@
-99,12
+99,21
@@
class ContainerWorkUnit < ProxyWorkUnit
end
def log_collection
end
def log_collection
- get_combined(:log)
+ if @proxied.is_a?(ContainerRequest)
+ get(:log_uuid)
+ else
+ get(:log)
+ end
end
def outputs
items = []
end
def outputs
items = []
- items << get_combined(:output) if get_combined(:output)
+ if @proxied.is_a?(ContainerRequest)
+ out = get(:output_uuid)
+ else
+ out = get(:output)
+ end
+ items << out if out
items
end
items
end