X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a5e1609e6f34ee041a92fa089ccf0ed66448bf15..27697133a18371d692d69569659dd522e7b0fbdd:/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 3b5ac86f91..c0e670dcef 100644 --- 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 - 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] @@ -131,6 +131,10 @@ class ArvadosBase < ActiveRecord::Base 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 @@ -316,7 +320,7 @@ class ArvadosBase < ActiveRecord::Base end def attribute_editable?(attr, ever=nil) - if "created_at modified_at modified_by_user_uuid modified_by_client_uuid updated_at".index(attr.to_s) + if %w(created_at modified_at modified_by_user_uuid modified_by_client_uuid updated_at).include? attr.to_s false elsif not (current_user.andand.is_active) false