rails upgrade to 4

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

diff --git a/app/models/artist.rb b/app/models/artist.rb
index 3fc4bc9..77dbf1f 100644 (file)
--- a/app/models/artist.rb
+++ b/app/models/artist.rb
@@ -15,7 +15,7 @@ class Artist < Peta::Owner
   end
   
   def self.find_by_author author
-    Artist.find( :first, :conditions => ['author_id = ?', author.id])
+    Artist.where(author_id: author.id).first
   end
   
   def self.index_list_where list
@@ -27,15 +27,9 @@ class Artist < Peta::Owner
   end
   
   def self.export(dt = nil)
-    opt = {}
-    cond = if dt
-      ['artists.artists.provider = 0 and artists.updated_at >= ?', dt]
-    else
-      'artists.artists.provider = 0'
-    end
-    opt.merge!({:conditions => cond}) 
-    opt.merge!({:order => 'id'})
-    Artist.find(:all, opt)
+    artists = Artist.where('artists.provider = 0')
+    artists = artists.where(['artists.updated_at >= ?', dt]) if dt
+    artists.order(:id)
   end
   
 end