X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/afabb6c30c449d6139aec344d0912fc2645e2e89..ac36412ff05d99c6bd6cdc236d5cb8b538cfe0ed:/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 f9159231a0..e56c065523 100644
--- a/apps/workbench/app/models/container_work_unit.rb
+++ b/apps/workbench/app/models/container_work_unit.rb
@@ -124,9 +124,13 @@ class ContainerWorkUnit < ProxyWorkUnit
     get_combined(:output_path)
   end
 
+  def log_object_uuids
+    [get_combined(:uuid), get(:uuid)].uniq
+  end
+
   def live_log_lines(limit=2000)
     event_types = ["stdout", "stderr", "arv-mount", "crunch-run"]
-    log_lines = Log.where(event_type: event_types, object_uuid: uuid).order("id DESC").limit(limit)
+    log_lines = Log.where(event_type: event_types, object_uuid: log_object_uuids).order("id DESC").limit(limit)
     log_lines.results.reverse.
       flat_map { |log| log.properties[:text].split("\n") rescue [] }
   end
@@ -138,6 +142,13 @@ class ContainerWorkUnit < ProxyWorkUnit
     end
   end
 
+  def template_uuid
+    properties = get(:properties)
+    if properties
+      properties[:template_uuid]
+    end
+  end
+
   # End combined propeties
 
   protected