Merge branch 'master' into 2767-doc-updates

[arvados.git] / services / api / app / models / job_task.rb

diff --git a/services/api/app/models/job_task.rb b/services/api/app/models/job_task.rb
index c951d439f4f9b6916aa015c9889bdfa520bab528..d5d2eddf7d3b382353dab2b10e08e505f4e3d2b3 100644 (file)
--- a/services/api/app/models/job_task.rb
+++ b/services/api/app/models/job_task.rb
@@ -1,14 +1,14 @@
 class JobTask < ArvadosModel
-  include AssignUuid
+  include HasUuid
   include KindAndEtag
   include CommonApiTemplate
   serialize :parameters, Hash
   after_update :delete_created_job_tasks_if_failed
   after_update :assign_created_job_tasks_qsequence_if_succeeded
 
-  api_accessible :superuser, :extend => :common do |t|
+  api_accessible :user, extend: :common do |t|
     t.add :job_uuid
-    t.add :created_by_job_task
+    t.add :created_by_job_task_uuid
     t.add :sequence
     t.add :qsequence
     t.add :parameters
@@ -21,7 +21,7 @@ class JobTask < ArvadosModel
 
   def delete_created_job_tasks_if_failed
     if self.success == false and self.success != self.success_was
-      JobTask.destroy_all('created_by_job_task = ?', self.uuid)
+      JobTask.delete_all ['created_by_job_task_uuid = ?', self.uuid]
     end
   end
 
@@ -29,8 +29,8 @@ class JobTask < ArvadosModel
     if self.success == false and self.success != self.success_was
       # xxx qsequence should be sequential as advertised; for now at
       # least it's non-decreasing.
-      JobTask.update_all(['qsequence = ?', Time.now.to_f*1000000],
-                         ['created_by_job_task = ?', self.uuid])
+      JobTask.update_all(['qsequence = ?', (Time.now.to_f*10000000).to_i],
+                         ['created_by_job_task_uuid = ?', self.uuid])
     end
   end
 end