X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9c3904d27dc7d6b6aa5834ff0f5815a8b3685e99..4f552c0187f8c31d94ff74485c57ef7f9888597e:/services/api/app/models/job.rb diff --git a/services/api/app/models/job.rb b/services/api/app/models/job.rb index 21414e2f04..0b2247bc21 100644 --- a/services/api/app/models/job.rb +++ b/services/api/app/models/job.rb @@ -27,6 +27,7 @@ class Job < ArvadosModel t.add :started_at t.add :finished_at t.add :output + t.add :output_is_persistent t.add :success t.add :running t.add :is_locked_by_uuid @@ -37,6 +38,7 @@ class Job < ArvadosModel t.add :log_stream_href t.add :log_buffer t.add :nondeterministic + t.add :repository end def assert_finished @@ -68,6 +70,10 @@ class Job < ArvadosModel super + %w(output log) end + def skip_uuid_read_permission_check + super + %w(cancelled_by_client_uuid) + end + def ensure_script_version_is_commit if self.is_locked_by_uuid and self.started_at # Apparently client has already decided to go for it. This is @@ -76,7 +82,7 @@ class Job < ArvadosModel return true end if new_record? or script_version_changed? - sha1 = Commit.find_commit_range(current_user, nil, nil, self.script_version)[0] rescue nil + sha1 = Commit.find_commit_range(current_user, nil, nil, self.script_version, nil)[0] rescue nil if sha1 self.script_version = sha1 else