From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 8 Dec 2011 18:50:15 +0000 (+0000)
Subject: Tests broken with ruby1.8.6 (#9751).
X-Git-Tag: 1.4.0~1146
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3976e2d15dd0ea7ffdb6ceff8910fcaae0b6ed67;p=redmine.git

Tests broken with ruby1.8.6 (#9751).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8128 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/models/query.rb b/app/models/query.rb
index 3e2fec29d..fad42fcb2 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -363,7 +363,8 @@ class Query < ActiveRecord::Base
                            ).collect {|cf| QueryCustomFieldColumn.new(cf) }
 
     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)
       # insert the column after estimated_hours or at the end
       @available_columns.insert index, QueryColumn.new(:spent_hours,