meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Total estimated time column shows up as decimal value regardless of time setting (#33273).

Browse Source 
Patch by Farook Al-Sammarraie.


git-svn-id: http://svn.redmine.org/redmine/trunk@19702 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2020-04-15 14:11:20 +00:00
parent 6d6f765e03
commit 4048e6640e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/queries_helper.rb
View File

@ -167,7 +167,7 @@ module QueriesHelper
def total_tag(column, value) def total_tag(column, value)
label = content_tag('span', "#{column.caption}:") label = content_tag('span', "#{column.caption}:")
value = 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) format_hours(value)
else else
format_object(value) format_object(value)
@ -238,7 +238,7 @@ module QueriesHelper
'span', 'span',
value.to_s(item) {|other| link_to_issue(other, :subject => false, :tracker => false)}.html_safe, value.to_s(item) {|other| link_to_issue(other, :subject => false, :tracker => false)}.html_safe,
:class => value.css_classes_for(item)) :class => value.css_classes_for(item))
when :hours, :estimated_hours when :hours, :estimated_hours, :total_estimated_hours
format_hours(value) format_hours(value)
when :spent_hours when :spent_hours
link_to_if(value > 0, format_hours(value), project_time_entries_path(item.project, :issue_id => "#{item.id}")) link_to_if(value > 0, format_hours(value), project_time_entries_path(item.project, :issue_id => "#{item.id}"))