Include both last and first name when sorting issues by assignee (#1841).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2351 e93f8b46-1217-0410-a6f0-8f06a7374b81

Include both last and first name when sorting issues by assignee (#1841).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2351 e93f8b46-1217-0410-a6f0-8f06a7374b81
2a220a9e · Jean-Philippe Lang · ab5e07e8 · 2a220a9e · 2a220a9e
Commit 2a220a9e authored Feb 01, 2009 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sort_helper.rb app/helpers/sort_helper.rb +1 -1

query.rb app/models/query.rb +1 -1

No files found.
--- 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.

--- 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'),