diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-03-04 11:45:15 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-03-04 11:45:15 +0000 |
| commit | bf05656c364aff551bdb3720042454a64a47d4d8 (patch) | |
| tree | e158f25751d7cfaa45de720447f2421737cbdace /app | |
| parent | 64d843a4d7156c94f6444e225d7606a21a312180 (diff) | |
| download | redmine-bf05656c364aff551bdb3720042454a64a47d4d8.tar.gz redmine-bf05656c364aff551bdb3720042454a64a47d4d8.zip | |
Rails 3.1 compatibility.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9074 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/query.rb | 4 |
1 files 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 |