projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Short-circuts #readable_by when the user is admin.
[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..7d568e952a6c20eb69781708db5d0627bab11080 100644
(file)
--- a/
services/api/app/models/job_task.rb
+++ b/
services/api/app/models/job_task.rb
@@
-6,9
+6,9
@@
class JobTask < ArvadosModel
after_update :delete_created_job_tasks_if_failed
after_update :assign_created_job_tasks_qsequence_if_succeeded
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 :job_uuid
- t.add :created_by_job_task
+ t.add :created_by_job_task
_uuid
t.add :sequence
t.add :qsequence
t.add :parameters
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
def delete_created_job_tasks_if_failed
if self.success == false and self.success != self.success_was
- JobTask.de
stroy_all('created_by_job_task = ?', self.uuid)
+ JobTask.de
lete_all ['created_by_job_task_uuid = ?', self.uuid]
end
end
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.
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
end
end
end