diff options
| author | Go MAEDA <maeda@farend.jp> | 2020-04-15 14:11:20 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2020-04-15 14:11:20 +0000 |
| commit | 4048e6640eab04bcbc49ffe9ce2c2873363b0fa6 (patch) | |
| tree | ad2911b5ce1c416a4f0fa20ea2ba9b22f22ce604 /app/helpers | |
| parent | 6d6f765e03b557d3e1618cf0cb77fbd1a24e429c (diff) | |
| download | redmine-4048e6640eab04bcbc49ffe9ce2c2873363b0fa6.tar.gz redmine-4048e6640eab04bcbc49ffe9ce2c2873363b0fa6.zip | |
Total estimated time column shows up as decimal value regardless of time setting (#33273).
Patch by Farook Al-Sammarraie.
git-svn-id: http://svn.redmine.org/redmine/trunk@19702 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/queries_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb index 2e5b86b6e..a9d8cff6f 100644 --- a/app/helpers/queries_helper.rb +++ b/app/helpers/queries_helper.rb @@ -167,7 +167,7 @@ module QueriesHelper def total_tag(column, value) label = content_tag('span', "#{column.caption}:") value = - if [:hours, :spent_hours, :total_spent_hours, :estimated_hours].include? column.name + if [:hours, :spent_hours, :total_spent_hours, :estimated_hours, :total_estimated_hours].include? column.name format_hours(value) else format_object(value) @@ -238,7 +238,7 @@ module QueriesHelper 'span', value.to_s(item) {|other| link_to_issue(other, :subject => false, :tracker => false)}.html_safe, :class => value.css_classes_for(item)) - when :hours, :estimated_hours + when :hours, :estimated_hours, :total_estimated_hours format_hours(value) when :spent_hours link_to_if(value > 0, format_hours(value), project_time_entries_path(item.project, :issue_id => "#{item.id}")) |