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 /app/helpers/timelog_helper.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 'app/helpers/timelog_helper.rb')
| -rw-r--r-- | app/helpers/timelog_helper.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb index cf5629f52..8ea09d8d5 100644 --- a/app/helpers/timelog_helper.rb +++ b/app/helpers/timelog_helper.rb @@ -96,8 +96,10 @@ module TimelogHelper else obj end + elsif cf = criteria_options[:custom_field] + format_value(value, cf) else - format_value(value, criteria_options[:format]) + value.to_s end end |