From bf05656c364aff551bdb3720042454a64a47d4d8 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 4 Mar 2012 11:45:15 +0000 Subject: [PATCH] Rails 3.1 compatibility. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9074 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/query.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/query.rb b/app/models/query.rb index 9451b79fd..4e72ae5c7 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -609,12 +609,12 @@ class Query < ActiveRecord::Base joins = (order_option && order_option.include?('authors')) ? "LEFT OUTER JOIN users authors ON authors.id = #{Issue.table_name}.author_id" : nil - Issue.visible.scoped(:conditions => options[:conditions]).find_ids :include => ([:status, :project] + (options[:include] || [])).uniq, + Issue.visible.scoped(:conditions => options[:conditions]).scoped(:include => ([:status, :project] + (options[:include] || [])).uniq, :conditions => statement, :order => order_option, :joins => joins, :limit => options[:limit], - :offset => options[:offset] + :offset => options[:offset]).find_ids rescue ::ActiveRecord::StatementInvalid => e raise StatementInvalid.new(e.message) end -- 2.39.5