Mercurial > hg > soundsoftware-site
diff 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 |
line wrap: on
line diff
--- a/app/helpers/sort_helper.rb Fri Jun 14 09:05:06 2013 +0100 +++ b/app/helpers/sort_helper.rb Tue Jan 14 14:37:42 2014 +0000 @@ -80,12 +80,13 @@ @criteria.collect {|k,o| k + (o ? '' : ':desc')}.join(',') end + # Returns an array of SQL fragments used to sort the list def to_sql sql = @criteria.collect do |k,o| if s = @available_criteria[k] - (o ? s.to_a : s.to_a.collect {|c| append_desc(c)}).join(', ') + (o ? s.to_a : s.to_a.collect {|c| append_desc(c)}) end - end.compact.join(', ') + end.flatten.compact sql.blank? ? nil : sql end