5 files changed, 34 insertions, 47 deletions
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index fb038a3cc3f..9bc0dfb3574 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -54,15 +54,7 @@ module Issuable
     end
 
     def sort(method)
-      case method.to_s
-      when 'newest' then reorder("#{table_name}.created_at DESC")
-      when 'oldest' then reorder("#{table_name}.created_at ASC")
-      when 'recently_updated' then reorder("#{table_name}.updated_at DESC")
-      when 'last_updated' then reorder("#{table_name}.updated_at ASC")
-      when 'milestone_due_soon' then joins(:milestone).reorder("milestones.due_date ASC")
-      when 'milestone_due_later' then joins(:milestone).reorder("milestones.due_date DESC")
-      else reorder("#{table_name}.created_at DESC")
-      end
+      order_by(method)
     end
   end
 
diff --git a/app/models/concerns/sortable.rb b/app/models/concerns/sortable.rb
index dc46b2e5463..c894dbda6ef 100644
--- a/app/models/concerns/sortable.rb
+++ b/app/models/concerns/sortable.rb
@@ -9,21 +9,26 @@ module Sortable
     # By default all models should be ordered
     # by created_at field starting from newest
     default_scope { order(created_at: :desc, id: :desc) }
-    scope :order_name, -> { reorder(name: :asc) }
-    scope :order_recent, -> { reorder(created_at: :desc, id: :desc) }
-    scope :order_oldest, -> { reorder(created_at: :asc, id: :asc) }
-    scope :order_recent_updated, -> { reorder(updated_at: :desc, id: :desc) }
-    scope :order_oldest_updated, -> { reorder(updated_at: :asc, id: :asc) }
+
+    scope :order_name_asc, -> { reorder(name: :asc) }
+    scope :order_created_desc, -> { reorder(created_at: :desc, id: :desc) }
+    scope :order_created_asc, -> { reorder(created_at: :asc, id: :asc) }
+    scope :order_updated_desc, -> { reorder(updated_at: :desc, id: :desc) }
+    scope :order_updated_asc, -> { reorder(updated_at: :asc, id: :asc) }
+    scope :order_milestone_due_desc, -> { joins(:milestone).reorder('milestones.due_date DESC, milestones.id DESC') }
+    scope :order_milestone_due_asc, -> { joins(:milestone).reorder('milestones.due_date ASC, milestones.id ASC') }
   end
 
   module ClassMethods
     def order_by(method)
       case method.to_s
-      when 'name' then order_name_asc
-      when 'recent' then order_recent
-      when 'oldest' then order_oldest
-      when 'recent_updated' then order_recent_updated
-      when 'oldest_updated' then order_oldest_updated
+      when 'name_asc' then order_name_asc
+      when 'updated_asc' then order_updated_asc
+      when 'updated_desc' then order_updated_desc
+      when 'created_asc' then order_created_asc
+      when 'created_desc' then order_created_desc
+      when 'milestone_due_asc' then order_milestone_due_asc
+      when 'milestone_due_desc' then order_milestone_due_desc
       else
         all
       end
diff --git a/app/models/group.rb b/app/models/group.rb
index 042b79a7850..d6ec0be6081 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -28,6 +28,16 @@ class Group < Namespace
   after_create :post_create_hook
   after_destroy :post_destroy_hook
 
+  class << self
+    def search(query)
+      where("LOWER(namespaces.name) LIKE :query or LOWER(namespaces.path) LIKE :query", query: "%#{query.downcase}%")
+    end
+
+    def sort(method)
+      order_by(method)
+    end
+  end
+
   def human_name
     name
   end
@@ -88,20 +98,4 @@ class Group < Namespace
   def system_hook_service
     SystemHooksService.new
   end
-
-  class << self
-    def search(query)
-      where("LOWER(namespaces.name) LIKE :query or LOWER(namespaces.path) LIKE :query", query: "%#{query.downcase}%")
-    end
-
-    def sort(method)
-      case method.to_s
-      when "newest" then reorder("namespaces.created_at DESC")
-      when "oldest" then reorder("namespaces.created_at ASC")
-      when "recently_updated" then reorder("namespaces.updated_at DESC")
-      when "last_updated" then reorder("namespaces.updated_at ASC")
-      else reorder("namespaces.path, namespaces.name ASC")
-      end
-    end
-  end
 end
diff --git a/app/models/project.rb b/app/models/project.rb
index 246479624ee..a793e21f12d 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -231,13 +231,10 @@ class Project < ActiveRecord::Base
     end
 
     def sort(method)
-      case method.to_s
-      when 'newest' then reorder('projects.created_at DESC')
-      when 'oldest' then reorder('projects.created_at ASC')
-      when 'recently_updated' then reorder('projects.updated_at DESC')
-      when 'last_updated' then reorder('projects.updated_at ASC')
-      when 'largest_repository' then reorder('projects.repository_size DESC')
-      else reorder('namespaces.path, projects.name ASC')
+      if method == 'repository_size_desc'
+        reorder(repository_size: :desc, id: :desc)
+      else
+        order_by(method)
       end
     end
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index 41c52440320..ba61ecf3981 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -199,11 +199,10 @@ class User < ActiveRecord::Base
 
     def sort(method)
       case method.to_s
-      when 'recent_sign_in' then reorder('users.last_sign_in_at DESC')
-      when 'oldest_sign_in' then reorder('users.last_sign_in_at ASC')
-      when 'recently_created' then reorder('users.created_at DESC')
-      when 'late_created' then reorder('users.created_at ASC')
-      else reorder("users.name ASC")
+      when 'recent_sign_in' then reorder(last_sign_in_at: :desc)
+      when 'oldest_sign_in' then reorder(last_sign_in_at: :asc)
+      else
+        order_by(method)
       end
     end