Merge branch '2257-inequality-conditions' into 2290-user-activity

[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 09e3d8cea286f4ff8695b74f02f449536bb658f2..4ba53b952992d043e8ee04fce98db7f307f84286 100644 (file)
--- a/apps/workbench/app/models/arvados_base.rb
+++ b/apps/workbench/app/models/arvados_base.rb
@@ -61,13 +61,16 @@ class ArvadosBase < ActiveRecord::Base
     attr_reader :kind
     @columns
   end
     attr_reader :kind
     @columns
   end

+

   def self.column(name, sql_type = nil, default = nil, null = true)
     ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, sql_type.to_s, null)
   end
   def self.column(name, sql_type = nil, default = nil, null = true)
     ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, sql_type.to_s, null)
   end

+

   def self.attribute_info
     self.columns
     @attribute_info
   end
   def self.attribute_info
     self.columns
     @attribute_info
   end

+

   def self.find(uuid, opts={})
     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'
   def self.find(uuid, opts={})
     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'


@@ -84,24 +87,31 @@ class ArvadosBase < ActiveRecord::Base
     end
     new.private_reload(hash)
   end
     end
     new.private_reload(hash)
   end

+

   def self.order(*args)
     ArvadosResourceList.new(self).order(*args)
   end
   def self.order(*args)
     ArvadosResourceList.new(self).order(*args)
   end

+

   def self.filter(*args)
     ArvadosResourceList.new(self).filter(*args)
   end
   def self.filter(*args)
     ArvadosResourceList.new(self).filter(*args)
   end

+

   def self.where(*args)
     ArvadosResourceList.new(self).where(*args)
   end
   def self.where(*args)
     ArvadosResourceList.new(self).where(*args)
   end

+

   def self.limit(*args)
     ArvadosResourceList.new(self).limit(*args)
   end
   def self.limit(*args)
     ArvadosResourceList.new(self).limit(*args)
   end

+

   def self.eager(*args)
     ArvadosResourceList.new(self).eager(*args)
   end
   def self.eager(*args)
     ArvadosResourceList.new(self).eager(*args)
   end

+

   def self.all(*args)
     ArvadosResourceList.new(self).all(*args)
   end
   def self.all(*args)
     ArvadosResourceList.new(self).all(*args)
   end

+

   def save
     obdata = {}
     self.class.columns.each do |col|
   def save
     obdata = {}
     self.class.columns.each do |col|


@@ -131,8 +141,11 @@ class ArvadosBase < ActiveRecord::Base
       end
     end
 
       end
     end
 

+    @new_record = false
+

     self
   end
     self
   end

+

   def save!
     self.save or raise Exception.new("Save failed")
   end
   def save!
     self.save or raise Exception.new("Save failed")
   end


@@ -172,6 +185,7 @@ class ArvadosBase < ActiveRecord::Base
     @links = $arvados_api_client.api Link, '', { _method: 'GET', where: o, eager: true }
     @links = $arvados_api_client.unpack_api_response(@links)
   end
     @links = $arvados_api_client.api Link, '', { _method: 'GET', where: o, eager: true }
     @links = $arvados_api_client.unpack_api_response(@links)
   end

+

   def all_links
     return @all_links if @all_links
     res = $arvados_api_client.api Link, '', {
   def all_links
     return @all_links if @all_links
     res = $arvados_api_client.api Link, '', {


@@ -184,9 +198,11 @@ class ArvadosBase < ActiveRecord::Base
     }
     @all_links = $arvados_api_client.unpack_api_response(res)
   end
     }
     @all_links = $arvados_api_client.unpack_api_response(res)
   end

+

   def reload
     private_reload(self.uuid)
   end
   def reload
     private_reload(self.uuid)
   end

+

   def private_reload(uuid_or_hash)
     raise "No such object" if !uuid_or_hash
     if uuid_or_hash.is_a? Hash
   def private_reload(uuid_or_hash)
     raise "No such object" if !uuid_or_hash
     if uuid_or_hash.is_a? Hash


@@ -209,8 +225,14 @@ class ArvadosBase < ActiveRecord::Base
       end
     end
     @all_links = nil
       end
     end
     @all_links = nil

+    @new_record = false

     self
   end
     self
   end

+
+  def to_param
+    uuid
+  end
+

   def dup
     super.forget_uuid!
   end
   def dup
     super.forget_uuid!
   end


@@ -278,6 +300,10 @@ class ArvadosBase < ActiveRecord::Base
     (name if self.respond_to? :name) || uuid
   end
 
     (name if self.respond_to? :name) || uuid
   end
 

+  def selection_label
+    friendly_link_name
+  end
+

   protected
 
   def forget_uuid!
   protected
 
   def forget_uuid!