comparison app/helpers/sort_helper.rb @ 1298:4f746d8966dd redmine_2.3_integration

Merge from redmine-2.3 branch to create new branch redmine-2.3-integration
author Chris Cannam
date Fri, 14 Jun 2013 09:28:30 +0100
parents 622f24f53b42
children
comparison
equal deleted inserted replaced
1297:0a574315af3e 1298:4f746d8966dd
78 78
79 def to_param 79 def to_param
80 @criteria.collect {|k,o| k + (o ? '' : ':desc')}.join(',') 80 @criteria.collect {|k,o| k + (o ? '' : ':desc')}.join(',')
81 end 81 end
82 82
83 # Returns an array of SQL fragments used to sort the list
83 def to_sql 84 def to_sql
84 sql = @criteria.collect do |k,o| 85 sql = @criteria.collect do |k,o|
85 if s = @available_criteria[k] 86 if s = @available_criteria[k]
86 (o ? s.to_a : s.to_a.collect {|c| append_desc(c)}).join(', ') 87 (o ? s.to_a : s.to_a.collect {|c| append_desc(c)})
87 end 88 end
88 end.compact.join(', ') 89 end.flatten.compact
89 sql.blank? ? nil : sql 90 sql.blank? ? nil : sql
90 end 91 end
91 92
92 def to_a 93 def to_a
93 @criteria.dup 94 @criteria.dup