diff options
| -rw-r--r-- | app/helpers/sort_helper.rb | 2 | ||||
| -rw-r--r-- | app/models/query.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/sort_helper.rb b/app/helpers/sort_helper.rb index b0c72504b..f5e9bb494 100644 --- a/app/helpers/sort_helper.rb +++ b/app/helpers/sort_helper.rb @@ -84,7 +84,7 @@ module SortHelper session[@sort_name] = sort sort_column = (sort_keys.is_a?(Hash) ? sort_keys[sort[:key]] : sort[:key]) - @sort_clause = (sort_column.blank? ? nil : "#{sort_column} #{sort[:order]}") + @sort_clause = (sort_column.blank? ? nil : [sort_column].flatten.collect {|s| "#{s} #{sort[:order]}"}.join(',')) end # Returns an SQL sort clause corresponding to the current sort state. diff --git a/app/models/query.rb b/app/models/query.rb index 493144bf7..50103383b 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -98,7 +98,7 @@ class Query < ActiveRecord::Base QueryColumn.new(:priority, :sortable => "#{Enumeration.table_name}.position", :default_order => 'desc'), QueryColumn.new(:subject, :sortable => "#{Issue.table_name}.subject"), QueryColumn.new(:author), - QueryColumn.new(:assigned_to, :sortable => "#{User.table_name}.lastname"), + QueryColumn.new(:assigned_to, :sortable => ["#{User.table_name}.lastname", "#{User.table_name}.firstname"]), QueryColumn.new(:updated_on, :sortable => "#{Issue.table_name}.updated_on", :default_order => 'desc'), QueryColumn.new(:category, :sortable => "#{IssueCategory.table_name}.name"), QueryColumn.new(:fixed_version, :sortable => "#{Version.table_name}.effective_date", :default_order => 'desc'), |