diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-12-14 08:22:43 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-12-14 08:22:43 +0000 |
| commit | 2e2e2cfe425c2664517fb59836fbd3eff5e35861 (patch) | |
| tree | e3daa66ee8b36d2f1a1468ec9501fba5bc37d71c /lib/redmine/helpers/time_report.rb | |
| parent | c74f6d9f9bcf02ccc480a2028802b83ec5d91aca (diff) | |
| download | redmine-2e2e2cfe425c2664517fb59836fbd3eff5e35861.tar.gz redmine-2e2e2cfe425c2664517fb59836fbd3eff5e35861.zip | |
Merged custom fields format refactoring.
git-svn-id: http://svn.redmine.org/redmine/trunk@12400 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/helpers/time_report.rb')
| -rw-r--r-- | lib/redmine/helpers/time_report.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/redmine/helpers/time_report.rb b/lib/redmine/helpers/time_report.rb index 09093dc95..a52181063 100644 --- a/lib/redmine/helpers/time_report.rb +++ b/lib/redmine/helpers/time_report.rb @@ -138,9 +138,10 @@ module Redmine # Add list and boolean custom fields as available criteria custom_fields.select {|cf| %w(list bool).include? cf.field_format }.each do |cf| - @available_criteria["cf_#{cf.id}"] = {:sql => "#{cf.join_alias}.value", + @available_criteria["cf_#{cf.id}"] = {:sql => cf.group_statement, :joins => cf.join_for_order_statement, :format => cf.field_format, + :custom_field => cf, :label => cf.name} end |