Mercurial > hg > soundsoftware-site
comparison app/helpers/sort_helper.rb @ 1464:261b3d9a4903 redmine-2.4
Update to Redmine 2.4 branch rev 12663
author | Chris Cannam |
---|---|
date | Tue, 14 Jan 2014 14:37:42 +0000 |
parents | 433d4f72a19b |
children |
comparison
equal
deleted
inserted
replaced
1296:038ba2d95de8 | 1464:261b3d9a4903 |
---|---|
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 |