X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f3658ececac430166ee9766be1deee6a61153d0f..007d2919fc56632bc957d90378ed7a5d3b14aa3c:/apps/workbench/app/models/job.rb

diff --git a/apps/workbench/app/models/job.rb b/apps/workbench/app/models/job.rb
index b91c6bcc9d..128440d526 100644
--- a/apps/workbench/app/models/job.rb
+++ b/apps/workbench/app/models/job.rb
@@ -27,7 +27,7 @@ class Job < ArvadosBase
   end
 
   def cancel
-    arvados_api_client.api "jobs/#{self.uuid}/", "cancel", {}
+    arvados_api_client.api "jobs/#{self.uuid}/", "cancel", {"cascade" => true}
   end
 
   def self.queue_size
@@ -43,8 +43,7 @@ class Job < ArvadosBase
   end
 
   def stderr_log_query(limit=nil)
-    query = Log.where(event_type: "stderr", object_uuid: self.uuid)
-               .order("id DESC")
+    query = Log.where(object_uuid: self.uuid).order("created_at DESC").with_count('none')
     query = query.limit(limit) if limit
     query
   end
@@ -54,7 +53,7 @@ class Job < ArvadosBase
       flat_map { |log| log.properties[:text].split("\n") rescue [] }
   end
 
-  def work_unit(label="")
-    JobWorkUnit.new(self, label)
+  def work_unit(label=nil)
+    JobWorkUnit.new(self, label, self.uuid)
   end
 end