reorganize artist version search methods

app/models/artist.rb

@@ -254,7 +254,7 @@ class Artist < ActiveRecord::Base
         q = q.any_name_matches(params[:name])
       end
 
-      if params[:sort] == "Name"
+      if params[:sort] == "name"
         q = q.reorder("name")
       else
         q = q.reorder("id desc")

app/models/artist_version.rb

@@ -2,27 +2,39 @@ class ArtistVersion < ActiveRecord::Base
   belongs_to :updater, :class_name => "User"
   belongs_to :artist
 
-  def self.search(params)
+  module SearchMethods
-    q = scoped
+    def for_user(user_id)
-    return q if params.blank?
+      where("updater_id = ?", user_id)
-
-    if params[:name]
-      q = q.where("name like ? escape E'\\\\'", params[:name].to_escaped_for_sql_like)
     end
 
-    if params[:artist_id]
+    def search(params)
-      q = q.where("artist_id = ?", params[:artist_id].to_i)
+      q = scoped
-    end
+      return q if params.blank?
 
-    if params[:sort] == "Name"
+      if params[:name].present?
-      q = q.reorder("name")
+        q = q.where("name like ? escape E'\\\\'", params[:name].to_escaped_for_sql_like)
-    else
+      end
-      q = q.reorder("id desc")
-    end
 
-    q
+      if params[:updater_id].present?
+        q = q.for_user(params[:updater_id].to_i)
+      end
+
+      if params[:artist_id].present?
+        q = q.where("artist_id = ?", params[:artist_id].to_i)
+      end
+
+      if params[:sort] == "name"
+        q = q.reorder("name")
+      else
+        q = q.reorder("id desc")
+      end
+
+      q
+    end
   end
 
+  extend SearchMethods
+
   def url_array
     url_string.to_s.scan(/\S+/)
   end