Tests broken with ruby1.8.6 (#9751).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8128 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
aa127ebd4e
commit
3976e2d15d
|
@ -363,7 +363,8 @@ class Query < ActiveRecord::Base
|
||||||
).collect {|cf| QueryCustomFieldColumn.new(cf) }
|
).collect {|cf| QueryCustomFieldColumn.new(cf) }
|
||||||
|
|
||||||
if User.current.allowed_to?(:view_time_entries, project, :global => true)
|
if User.current.allowed_to?(:view_time_entries, project, :global => true)
|
||||||
index = @available_columns.index {|column| column.name == :estimated_hours}
|
index = nil
|
||||||
|
@available_columns.each_with_index {|column, i| index = i if column.name == :estimated_hours}
|
||||||
index = (index ? index + 1 : -1)
|
index = (index ? index + 1 : -1)
|
||||||
# insert the column after estimated_hours or at the end
|
# insert the column after estimated_hours or at the end
|
||||||
@available_columns.insert index, QueryColumn.new(:spent_hours,
|
@available_columns.insert index, QueryColumn.new(:spent_hours,
|
||||||
|
|
Loading…
Reference in New Issue