# HG changeset patch
# User olivier
# Date 1474547038 -7200
#      Thu Sep 22 14:23:58 2016 +0200
# Node ID 70b110c05b453d0a9e3b38c962e58236ce977278
# Parent  5d751373505158aacf262a47fcfc2c67896d2d25
Proposed fix for duplicated sort columns error in MSSQL query

diff -r 5d7513735051 -r 70b110c05b45 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 22 14:23:58 2016 +0200
@@ -328,7 +328,16 @@
 
   # Returns the issues ids
   def issue_ids(options={})
-    order_option = [group_by_sort_order, options[:order]].flatten.reject(&:blank?)
+    # Apply Options sort order in case of duplicated column, if there are group_by sorted columns
+    if group_by_sort_order
+      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
+    else
+    order_option = [options[:order]].flatten.reject(&:blank?)
+    end
 
     Issue.visible.
       joins(:status, :project).