Преглед на файлове

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

Pätch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@14602 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/3.2.0
Jean-Philippe Lang преди 8 години
родител
ревизия
d1d1f81e94
променени са 1 файла, в които са добавени 2 реда и са изтрити 3 реда
  1. 2
    3
      app/models/issue_query.rb

+ 2
- 3
app/models/issue_query.rb Целия файл

@@ -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',

Loading…
Отказ
Запис