Project

General

Profile

« Previous | Next » 

Revision 2351

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

View differences:

trunk/app/helpers/sort_helper.rb
84 84
    session[@sort_name] = sort
85 85
    
86 86
    sort_column = (sort_keys.is_a?(Hash) ? sort_keys[sort[:key]] : sort[:key])
87
    @sort_clause = (sort_column.blank? ? nil : "#{sort_column} #{sort[:order]}")
87
    @sort_clause = (sort_column.blank? ? nil : [sort_column].flatten.collect {|s| "#{s} #{sort[:order]}"}.join(','))
88 88
  end
89 89

  
90 90
  # Returns an SQL sort clause corresponding to the current sort state.
trunk/app/models/query.rb
98 98
    QueryColumn.new(:priority, :sortable => "#{Enumeration.table_name}.position", :default_order => 'desc'),
99 99
    QueryColumn.new(:subject, :sortable => "#{Issue.table_name}.subject"),
100 100
    QueryColumn.new(:author),
101
    QueryColumn.new(:assigned_to, :sortable => "#{User.table_name}.lastname"),
101
    QueryColumn.new(:assigned_to, :sortable => ["#{User.table_name}.lastname", "#{User.table_name}.firstname"]),
102 102
    QueryColumn.new(:updated_on, :sortable => "#{Issue.table_name}.updated_on", :default_order => 'desc'),
103 103
    QueryColumn.new(:category, :sortable => "#{IssueCategory.table_name}.name"),
104 104
    QueryColumn.new(:fixed_version, :sortable => "#{Version.table_name}.effective_date", :default_order => 'desc'),

Also available in: Unified diff