projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
limit data page to 1-3000 collections
[arvados.git]
/
app
/
models
/
orvos_base.rb
diff --git
a/app/models/orvos_base.rb
b/app/models/orvos_base.rb
index 7262df061d625472a2eef539ea5d2f9f75e45dfc..96016059cad97d232c5a177698cafaf117cc5cc5 100644
(file)
--- a/
app/models/orvos_base.rb
+++ b/
app/models/orvos_base.rb
@@
-23,11
+23,17
@@
class OrvosBase < ActiveRecord::Base
ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, sql_type.to_s, null)
end
def self.find(uuid)
ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, sql_type.to_s, null)
end
def self.find(uuid)
+ if uuid.class != String or uuid.length < 27 then
+ raise 'argument to find() must be a uuid string. Acceptable formats: warehouse locator or string with format xxxxx-xxxxx-xxxxxxxxxxxxxxx'
+ end
new.private_reload(uuid)
end
def self.where(*args)
OrvosResourceList.new(self).where(*args)
end
new.private_reload(uuid)
end
def self.where(*args)
OrvosResourceList.new(self).where(*args)
end
+ def self.limit(*args)
+ OrvosResourceList.new(self).limit(*args)
+ end
def self.eager(*args)
OrvosResourceList.new(self).eager(*args)
end
def self.eager(*args)
OrvosResourceList.new(self).eager(*args)
end
@@
-102,7
+108,7
@@
class OrvosBase < ActiveRecord::Base
if uuid_or_hash.is_a? Hash
hash = uuid_or_hash
else
if uuid_or_hash.is_a? Hash
hash = uuid_or_hash
else
- hash = $orvos_api_client.api(self.class, '/' + uuid_or_hash
.to_s
)
+ hash = $orvos_api_client.api(self.class, '/' + uuid_or_hash)
end
hash.each do |k,v|
if self.respond_to?(k.to_s + '=')
end
hash.each do |k,v|
if self.respond_to?(k.to_s + '=')