projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3261-keep-docker-config
[arvados.git]
/
apps
/
workbench
/
app
/
models
/
arvados_base.rb
diff --git
a/apps/workbench/app/models/arvados_base.rb
b/apps/workbench/app/models/arvados_base.rb
index aca87868c3ab7f1f3523fc66d6569f031c8e99f2..1dac43fa61a7ffbd2c100b3f932b4568f174ee73 100644
(file)
--- a/
apps/workbench/app/models/arvados_base.rb
+++ b/
apps/workbench/app/models/arvados_base.rb
@@
-56,7
+56,7
@@
class ArvadosBase < ActiveRecord::Base
end
def self.columns
end
def self.columns
- return @columns
unless @columns.nil
?
+ return @columns
if @columns.andand.any
?
@columns = []
@attribute_info ||= {}
schema = arvados_api_client.discovery[:schemas][self.to_s.to_sym]
@columns = []
@attribute_info ||= {}
schema = arvados_api_client.discovery[:schemas][self.to_s.to_sym]
@@
-131,6
+131,10
@@
class ArvadosBase < ActiveRecord::Base
ArvadosResourceList.new(self).limit(*args)
end
ArvadosResourceList.new(self).limit(*args)
end
+ def self.select(*args)
+ ArvadosResourceList.new(self).select(*args)
+ end
+
def self.eager(*args)
ArvadosResourceList.new(self).eager(*args)
end
def self.eager(*args)
ArvadosResourceList.new(self).eager(*args)
end
@@
-295,6
+299,10
@@
class ArvadosBase < ActiveRecord::Base
self.class.to_s.underscore.humanize
end
self.class.to_s.underscore.humanize
end
+ def self.class_for_display
+ self.to_s.underscore.humanize
+ end
+
def self.creatable?
current_user
end
def self.creatable?
current_user
end