projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14873: Removes legacy setting as all controllers were migrated.
[arvados.git]
/
services
/
api
/
app
/
models
/
job.rb
diff --git
a/services/api/app/models/job.rb
b/services/api/app/models/job.rb
index 8de3897eab0125bd712d2858e4a3d078e9ac1849..420386cdc2ac0b4cfa423bb423e9c6053ec8b4ba 100644
(file)
--- a/
services/api/app/models/job.rb
+++ b/
services/api/app/models/job.rb
@@
-12,7
+12,6
@@
class Job < ArvadosModel
extend CurrentApiClient
extend LogReuseInfo
serialize :components, Hash
extend CurrentApiClient
extend LogReuseInfo
serialize :components, Hash
- attr_protected :arvados_sdk_version, :docker_image_locator
serialize :script_parameters, Hash
serialize :runtime_constraints, Hash
serialize :tasks_summary, Hash
serialize :script_parameters, Hash
serialize :runtime_constraints, Hash
serialize :tasks_summary, Hash
@@
-33,7
+32,7
@@
class Job < ArvadosModel
has_many :commit_ancestors, :foreign_key => :descendant, :primary_key => :script_version
has_many(:nodes, foreign_key: :job_uuid, primary_key: :uuid)
has_many :commit_ancestors, :foreign_key => :descendant, :primary_key => :script_version
has_many(:nodes, foreign_key: :job_uuid, primary_key: :uuid)
- class SubmitIdReused <
Standard
Error
+ class SubmitIdReused <
Request
Error
end
api_accessible :user, extend: :common do |t|
end
api_accessible :user, extend: :common do |t|
@@
-83,6
+82,10
@@
class Job < ArvadosModel
["components"]
end
["components"]
end
+ def self.protected_attributes
+ [:arvados_sdk_version, :docker_image_locator]
+ end
+
def assert_finished
update_attributes(finished_at: finished_at || db_current_time,
success: success.nil? ? false : success,
def assert_finished
update_attributes(finished_at: finished_at || db_current_time,
success: success.nil? ? false : success,