meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-02-11 13:15:20 +00:00
Code Issues Releases Wiki Activity

"Total estimated time" should be inserted after "Estimated time" (#20733).

Browse Source 
Pätch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@14602 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2015-09-19 07:29:08 +00:00
parent d4e1f70308
commit d1d1f81e94
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/issue_query.rb
View File

@ -262,10 +262,9 @@ class IssueQuery < Query
).visible.collect {|cf| QueryCustomFieldColumn.new(cf) }
if User.current.allowed_to?(:view_time_entries, project, :global => true)
index = nil
@available_columns.each_with_index {|column, i| index = i if column.name == :estimated_hours}
index = @available_columns.find_index {|column| column.name == :total_estimated_hours}
index = (index ? index + 1 : -1)
# insert the column after estimated_hours or at the end
# insert the column after total_estimated_hours or at the end
@available_columns.insert index, QueryColumn.new(:spent_hours,
:sortable => "COALESCE((SELECT SUM(hours) FROM #{TimeEntry.table_name} WHERE #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id), 0)",
:default_order => 'desc',