# HG changeset patch
# User olivier
# Date 1473944462 -7200
#      Thu Sep 15 15:01:02 2016 +0200
# Node ID 7f1c029d4697ad4962ee706633a0863d9670e948
# Parent  5d751373505158aacf262a47fcfc2c67896d2d25
Proposed fix for duplicated sort columns error in MSSQL query

diff -r 5d7513735051 -r 7f1c029d4697 app/models/issue_query.rb
--- a/app/models/issue_query.rb	Thu Sep 15 11:03:45 2016 +0000
+++ b/app/models/issue_query.rb	Thu Sep 15 15:01:02 2016 +0200
@@ -328,7 +328,11 @@
 
   # Returns the issues ids
   def issue_ids(options={})
-    order_option = [group_by_sort_order, options[:order]].flatten.reject(&:blank?)
+    group_by_with_options_sort_order = group_by_sort_order.map { |a| 
+      i = options[:order].find_index { |b| (b.reverse.split(" ", 2).last == a.reverse.split(" ", 2).last) }
+      i.nil? ? a : options[:order][i]
+    }
+    order_option = [group_by_with_options_sort_order, options[:order]].flatten.reject(&:blank?).uniq
 
     Issue.visible.
       joins(:status, :project).