Explorar el Código

Moves sort joins for issues to IssueQuery.

git-svn-id: http://svn.redmine.org/redmine/trunk@16216 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/3.4.0
Jean-Philippe Lang hace 7 años
padre
commit
82afdc7f78
Se han modificado 2 ficheros con 12 adiciones y 3 borrados
  1. 12
    0
      app/models/issue_query.rb
  2. 0
    3
      app/models/query.rb

+ 12
- 0
app/models/issue_query.rb Ver fichero

@@ -505,4 +505,16 @@ class IssueQuery < Query
IssueRelation::TYPES.keys.each do |relation_type|
alias_method "sql_for_#{relation_type}_field".to_sym, :sql_for_relations
end

def joins_for_order_statement(order_options)
joins = [super]

if order_options
if order_options.include?('authors')
joins << "LEFT OUTER JOIN #{User.table_name} authors ON authors.id = #{queried_table_name}.author_id"
end
end

joins.any? ? joins.join(' ') : nil
end
end

+ 0
- 3
app/models/query.rb Ver fichero

@@ -1297,9 +1297,6 @@ class Query < ActiveRecord::Base
joins = []

if order_options
if order_options.include?('authors')
joins << "LEFT OUTER JOIN #{User.table_name} authors ON authors.id = #{queried_table_name}.author_id"
end
order_options.scan(/cf_\d+/).uniq.each do |name|
column = available_columns.detect {|c| c.name.to_s == name}
join = column && column.custom_field.join_for_order_statement

Cargando…
Cancelar
Guardar