jro_apps/redmine Commit - r8370:86a52eaedf2b

Makes .find_ids return integers....

Jean-Philippe Lang -

r8370:86a52eaedf2b

parent child

Context file:

r8370:86a52eaedf2b

app/controllers/issues_controller.rb +3 -3

                   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
+                  if (idx = issue_ids.index(@issue.id)) && idx < limit
-                    @prev_issue_id = issue_ids[idx - 1].to_i if idx > 0
+                    @prev_issue_id = issue_ids[idx - 1] if idx > 0
-                    @next_issue_id = issue_ids[idx + 1].to_i if idx < (issue_ids.size - 1)
+                    @next_issue_id = issue_ids[idx + 1] if idx < (issue_ids.size - 1)
                   end
                 end
               end

lib/redmine/core_ext/active_record.rb +1 -1

                   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

test/unit/query_test.rb +1 -1

                 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

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages