Makes .find_ids return integers.

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

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 7b3684c85db41ea99283c77701475e0d6cf3bf01..6433acc5f7aa428e99121e072b2eb6a7f3c6892d 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -287,9 +287,9 @@ private
       sort_update(@query.sortable_columns, 'issues_index_sort')
       limit = 500
       issue_ids = @query.issue_ids(:order => sort_clause, :limit => (limit + 1))
-      if (idx = issue_ids.index(@issue.id.to_s)) && idx < limit
-        @prev_issue_id = issue_ids[idx - 1].to_i if idx > 0
-        @next_issue_id = issue_ids[idx + 1].to_i if idx < (issue_ids.size - 1)
+      if (idx = issue_ids.index(@issue.id)) && idx < limit
+        @prev_issue_id = issue_ids[idx - 1] if idx > 0
+        @next_issue_id = issue_ids[idx + 1] if idx < (issue_ids.size - 1)
       end
     end
   end

diff --git a/lib/redmine/core_ext/active_record.rb b/lib/redmine/core_ext/active_record.rb
index ba57b639a6bee9736c4c74dbf3a1c21df45aeb95..f881f90a5b8a48772ef87adf4673f2ef1f56a82e 100644 (file)
--- a/lib/redmine/core_ext/active_record.rb
+++ b/lib/redmine/core_ext/active_record.rb
@@ -27,7 +27,7 @@ module ActiveRecord
       def find_ids_with_associations(options = {})
         catch :invalid_query do
           join_dependency = ActiveRecord::Associations::ClassMethods::JoinDependency.new(self, merge_includes(scope(:find, :include), options[:include]), options[:joins])
-          return connection.select_values(construct_ids_finder_sql_with_included_associations(options, join_dependency))
+          return connection.select_values(construct_ids_finder_sql_with_included_associations(options, join_dependency)).map(&:to_i)
         end
         []
       end

diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb
index 6fc0bd2e872f24b4b5f0f28ac511446eeef7cc69..78499bfd0217a41288e4189400ce394bbb4d9e4e 100644 (file)
--- a/test/unit/query_test.rb
+++ b/test/unit/query_test.rb
@@ -616,7 +616,7 @@ class QueryTest < ActiveSupport::TestCase
     q = Query.new(:name => '_')
     order = "issues.subject, issues.id"
     issues = q.issues(:order => order)
-    assert_equal issues.map(&:id).map(&:to_s), q.issue_ids(:order => order)
+    assert_equal issues.map(&:id), q.issue_ids(:order => order)
   end
 
   def test_label_for