projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '11509-keep-web-cors-range'
[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 b6e72dc526538d022166d52ff0a342373bb585cc..ed82f18036c1025bffb16e5267701045039bb167 100644
(file)
--- a/
apps/workbench/app/models/container_work_unit.rb
+++ b/
apps/workbench/app/models/container_work_unit.rb
@@
-1,7
+1,7
@@
class ContainerWorkUnit < ProxyWorkUnit
attr_accessor :container
class ContainerWorkUnit < ProxyWorkUnit
attr_accessor :container
- def initialize proxied, label
+ def initialize proxied, label
, parent
super
if @proxied.is_a?(ContainerRequest)
container_uuid = get(:container_uuid)
super
if @proxied.is_a?(ContainerRequest)
container_uuid = get(:container_uuid)
@@
-12,7
+12,7
@@
class ContainerWorkUnit < ProxyWorkUnit
end
def children
end
def children
- return
self.my_children if self.
my_children
+ return
@my_children if @
my_children
container_uuid = nil
container_uuid = if @proxied.is_a?(Container) then uuid else get(:container_uuid) end
container_uuid = nil
container_uuid = if @proxied.is_a?(Container) then uuid else get(:container_uuid) end
@@
-25,7
+25,7
@@
class ContainerWorkUnit < ProxyWorkUnit
end
end
end
end
-
self.
my_children = items
+
@
my_children = items
end
def title
end
def title
@@
-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