projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 2257-inequality-conditions
[arvados.git]
/
services
/
api
/
app
/
models
/
arvados_model.rb
diff --git
a/services/api/app/models/arvados_model.rb
b/services/api/app/models/arvados_model.rb
index c89efdf404abb3a0f7f9a374562851b57abe372d..84bdf957632d2c35999d1d247a2abcf342fd207d 100644
(file)
--- a/
services/api/app/models/arvados_model.rb
+++ b/
services/api/app/models/arvados_model.rb
@@
-40,12
+40,16
@@
class ArvadosModel < ActiveRecord::Base
def self.searchable_columns
self.columns.collect do |col|
def self.searchable_columns
self.columns.collect do |col|
- if [:string, :text].index(col.type) && col.name != 'owner_uuid'
+ if [:string, :text
, :datetime
].index(col.type) && col.name != 'owner_uuid'
col.name
end
end.compact
end
col.name
end
end.compact
end
+ def self.attribute_column attr
+ self.columns.select { |col| col.name == attr.to_s }.first
+ end
+
def eager_load_associations
self.class.columns.each do |col|
re = col.name.match /^(.*)_kind$/
def eager_load_associations
self.class.columns.each do |col|
re = col.name.match /^(.*)_kind$/