summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2014-01-27 01:07:17 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2014-01-27 01:07:17 +0000
commitecf27b3f125ad7f03939ab06f5cf98e00ac096d2 (patch)
treeee1bd327004e4fb2a03dc273d4edcd675080459d /app
parent0daa1a1a4f2b18af99dcf0aaedbcc45e7ed285c2 (diff)
downloadredmine-ecf27b3f125ad7f03939ab06f5cf98e00ac096d2.tar.gz
redmine-ecf27b3f125ad7f03939ab06f5cf98e00ac096d2.zip
Rails4: replace deprecated #connection from IssueCustomField model
DEPRECATION WARNING: #connection is deprecated in favour of accessing it via the class. git-svn-id: http://svn.redmine.org/redmine/trunk@12716 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/models/issue_custom_field.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/issue_custom_field.rb b/app/models/issue_custom_field.rb
index 776bb4f0a..a695eaea3 100644
--- a/app/models/issue_custom_field.rb
+++ b/app/models/issue_custom_field.rb
@@ -32,7 +32,7 @@ class IssueCustomField < CustomField
sql = super
id_column ||= id
tracker_condition = "#{Issue.table_name}.tracker_id IN (SELECT tracker_id FROM #{table_name_prefix}custom_fields_trackers#{table_name_suffix} WHERE custom_field_id = #{id_column})"
- project_condition = "EXISTS (SELECT 1 FROM #{CustomField.table_name} ifa WHERE ifa.is_for_all = #{connection.quoted_true} AND ifa.id = #{id_column})" +
+ project_condition = "EXISTS (SELECT 1 FROM #{CustomField.table_name} ifa WHERE ifa.is_for_all = #{ActiveRecord::Base.connection.quoted_true} AND ifa.id = #{id_column})" +
" OR #{Issue.table_name}.project_id IN (SELECT project_id FROM #{table_name_prefix}custom_fields_projects#{table_name_suffix} WHERE custom_field_id = #{id_column})"
"((#{sql}) AND (#{tracker_condition}) AND (#{project_condition}))"