Refactor issuable sorting a bit

1 files changed, 6 insertions, 5 deletions

diff --git a/app/models/concerns/sortable.rb b/app/models/concerns/sortable.rb
index c894dbda6ef..cca1ee08fe8 100644
--- a/app/models/concerns/sortable.rb
+++ b/app/models/concerns/sortable.rb
@@ -10,25 +10,26 @@ module Sortable
     # by created_at field starting from newest
     default_scope { order(created_at: :desc, id: :desc) }
 
-    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') }
+
+    if column_names.include?('name')
+      scope :order_name_asc, -> { reorder(name: :asc) }
+      scope :order_name_desc, -> { reorder(name: :desc) }
+    end
   end
 
   module ClassMethods
     def order_by(method)
       case method.to_s
       when 'name_asc' then order_name_asc
+      when 'name_desc' then order_name_desc
       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