merge:

[pettanr/pettanr.git] / app / models / artist.rb

diff --git a/app/models/artist.rb b/app/models/artist.rb
index fa455cd..3fc4bc9 100644 (file)
--- a/app/models/artist.rb
+++ b/app/models/artist.rb
@@ -9,42 +9,23 @@ class Artist < Peta::Owner
   validates :user_id, :numericality => true, :existence => {:both => false}
   validates :provider_id, :numericality => {:allow_nil => true}
   
-  def self.visible_count_options
-    {:conditions => ['artists.author_id is not null']}
-  end
-  
   def supply_default
     self.name = 'no name' if self.name.blank?
+    self.user_id = nil
   end
   
   def self.find_by_author author
     Artist.find( :first, :conditions => ['author_id = ?', author.id])
   end
   
-  def self.list_where
+  def self.index_list_where list
     'artists.provider_id is null'
   end
   
-  def self.list_order
-    'artists.created_at desc'
-  end
-  
-  def self.list_opt
-    {:user => {:author => {}} }
-  end
-  
-  def self.list_json_opt
-    {:include => {:user => {:author => {}}} }
-  end
-  
   def self.show_opt
     {:include => {:user => {:author => {}}} }
   end
   
-  def self.show_json_opt
-    {:include => {:user => {:author => {}}} }
-  end
-  
   def self.export(dt = nil)
     opt = {}
     cond = if dt