projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 2640-folder-api
[arvados.git]
/
services
/
api
/
lib
/
assign_uuid.rb
diff --git
a/services/api/lib/assign_uuid.rb
b/services/api/lib/assign_uuid.rb
index 1c4ca81a7ec0f9446dbcaf03760159651ff7dac6..50738aa65577fa1fa44bd16b258d9ecdf646ee9f 100644
(file)
--- a/
services/api/lib/assign_uuid.rb
+++ b/
services/api/lib/assign_uuid.rb
@@
-9,6
+9,12
@@
module AssignUuid
def uuid_prefix
Digest::MD5.hexdigest(self.to_s).to_i(16).to_s(36)[-5..-1]
end
def uuid_prefix
Digest::MD5.hexdigest(self.to_s).to_i(16).to_s(36)[-5..-1]
end
+ def generate_uuid
+ [Server::Application.config.uuid_prefix,
+ self.uuid_prefix,
+ rand(2**256).to_s(36)[-15..-1]].
+ join '-'
+ end
end
protected
end
protected
@@
-20,9
+26,6
@@
module AssignUuid
def assign_uuid
return true if !self.respond_to_uuid?
return true if uuid and current_user and current_user.is_admin
def assign_uuid
return true if !self.respond_to_uuid?
return true if uuid and current_user and current_user.is_admin
- self.uuid = [Server::Application.config.uuid_prefix,
- self.class.uuid_prefix,
- rand(2**256).to_s(36)[-15..-1]].
- join '-'
+ self.uuid = self.class.generate_uuid
end
end
end
end