projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '3825-crunch-pipe-to-arv-put-final'
[arvados.git]
/
services
/
api
/
lib
/
has_uuid.rb
diff --git
a/services/api/lib/has_uuid.rb
b/services/api/lib/has_uuid.rb
index df175f8602851a638db0a2b7727ccb1d489a792a..e0a56134fc2fbbaffe0674c9d425c1bd25bb31c9 100644
(file)
--- a/
services/api/lib/has_uuid.rb
+++ b/
services/api/lib/has_uuid.rb
@@
-36,18
+36,18
@@
module HasUuid
if re[1] == self.class.uuid_prefix
return true
else
if re[1] == self.class.uuid_prefix
return true
else
- self.errors.add(:uuid, "
Matched uuid type
'#{re[1]}', expected '#{self.class.uuid_prefix}'")
+ self.errors.add(:uuid, "
type field is
'#{re[1]}', expected '#{self.class.uuid_prefix}'")
return false
end
else
return false
end
else
- self.errors.add(:uuid, "
'#{self.uuid}' is not a valid Arvados UUID
")
+ self.errors.add(:uuid, "
not a valid Arvados uuid '#{self.uuid}'
")
return false
end
else
if self.new_record?
return false
end
else
if self.new_record?
- self.errors.add(:uuid, "
Not permitted to specify uui
d")
+ self.errors.add(:uuid, "
assignment not permitte
d")
else
else
- self.errors.add(:uuid, "
Not permitted to change uui
d")
+ self.errors.add(:uuid, "
change not permitte
d")
end
return false
end
end
return false
end