X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/70ac6969e76770bcc6becfe94aa5811a0f320fcb..02c368b2e6f6fd05930db1b57e5887b82a6c8b36:/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 e8b4cafd6a..d38ca7822d 100644 --- a/apps/workbench/app/models/arvados_base.rb +++ b/apps/workbench/app/models/arvados_base.rb @@ -1,6 +1,7 @@ class ArvadosBase < ActiveRecord::Base self.abstract_class = true attr_accessor :attribute_sortkey + attr_accessor :create_params def self.arvados_api_client ArvadosApiClient.new_or_current @@ -29,8 +30,9 @@ class ArvadosBase < ActiveRecord::Base end end - def initialize raw_params={} + def initialize raw_params={}, create_params={} super self.class.permit_attribute_params(raw_params) + @create_params = create_params @attribute_sortkey ||= { 'id' => nil, 'name' => '000', @@ -54,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] @@ -129,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 @@ -148,8 +154,10 @@ class ArvadosBase < ActiveRecord::Base ActionController::Parameters.new(raw_params).permit! end - def self.create raw_params={} - super(permit_attribute_params(raw_params)) + def self.create raw_params={}, create_params={} + x = super(permit_attribute_params(raw_params)) + x.create_params = create_params + x end def update_attributes raw_params={} @@ -168,6 +176,7 @@ class ArvadosBase < ActiveRecord::Base obdata.delete :uuid resp = arvados_api_client.api(self.class, '/' + uuid, postdata) else + postdata.merge!(@create_params) if @create_params resp = arvados_api_client.api(self.class, '', postdata) end return false if !resp[:etag] || !resp[:uuid] @@ -273,8 +282,9 @@ class ArvadosBase < ActiveRecord::Base uuid end - def dup - super.forget_uuid! + def initialize_copy orig + super + forget_uuid! end def attributes_for_display @@ -289,11 +299,20 @@ class ArvadosBase < ActiveRecord::Base self.class.to_s.underscore.humanize end + def self.class_for_display + self.to_s.underscore.humanize + end + + # Array of strings that are names of attributes that should be rendered as textile. + def textile_attributes + [] + end + def self.creatable? current_user end - def self.goes_in_folders? + def self.goes_in_projects? false end