projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2751-python-sdk-keep-proxy-support' closes #2751
[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 d3c3b1d64091bf11ae420f4568c15bbe86479291..fbc5640b3762fef94934ed271d8501b78c31ac14 100644
(file)
--- a/
services/api/app/models/job.rb
+++ b/
services/api/app/models/job.rb
@@
-1,5
+1,5
@@
class Job < ArvadosModel
class Job < ArvadosModel
- include
Assign
Uuid
+ include
Has
Uuid
include KindAndEtag
include CommonApiTemplate
serialize :script_parameters, Hash
include KindAndEtag
include CommonApiTemplate
serialize :script_parameters, Hash
@@
-86,7
+86,7
@@
class Job < ArvadosModel
return true
end
if new_record? or script_version_changed?
return true
end
if new_record? or script_version_changed?
- sha1 = Commit.find_commit_range(current_user,
nil
, nil, self.script_version, nil)[0] rescue nil
+ sha1 = Commit.find_commit_range(current_user,
self.repository
, nil, self.script_version, nil)[0] rescue nil
if sha1
self.script_version = sha1
else
if sha1
self.script_version = sha1
else