# HG changeset patch
# User olivier
# Date 1428398857 -7200
#      Tue Apr 07 11:27:37 2015 +0200
# Node ID 2e5bb10ba1f8d0d4a0ad88b10db8e6ef21a90157
# Parent  03ed4e938c1a39aea5cfebac5a84219e437f9317
Rails 4.2 compatibility

diff -r 03ed4e938c1a -r 2e5bb10ba1f8 plugins/extended_fields/app/models/user_list_setting.rb
--- a/plugins/extended_fields/app/models/user_list_setting.rb	Tue Apr 07 11:27:32 2015 +0200
+++ b/plugins/extended_fields/app/models/user_list_setting.rb	Tue Apr 07 11:27:37 2015 +0200
@@ -4,6 +4,7 @@
     SUPPORTED_LISTS = [ 'users', 'projects' ]
 
     serialize :columns, Array
+    attr_accessible :user_id, :list
 
     validates_presence_of :user, :list, :columns
     validates_uniqueness_of :user_id, :scope => :list
diff -r 03ed4e938c1a -r 2e5bb10ba1f8 plugins/extended_fields/lib/extended_calendars_controller_patch.rb
--- a/plugins/extended_fields/lib/extended_calendars_controller_patch.rb	Tue Apr 07 11:27:32 2015 +0200
+++ b/plugins/extended_fields/lib/extended_calendars_controller_patch.rb	Tue Apr 07 11:27:37 2015 +0200
@@ -26,23 +26,19 @@
             @query.group_by = nil
             if @query.valid?
                 events = []
-                events += @query.issues(:include => [ :tracker, :assigned_to, :priority ],
-                                        :conditions => [ "((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt ])
-                events += @query.versions(:conditions => [ "effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt ])
+                events += @query.issues.includes([ :tracker, :assigned_to, :priority ]).where([ "((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt ])
+                events += @query.versions.where([ "effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt ])
 
                 issue_ids = @query.respond_to?(:issue_ids) ? @query.issue_ids : @query.issues.collect(&:id)
-                events += CustomValue.find(:all, :include => :custom_field,
-                                                 :conditions => [ "#{CustomField.table_name}.field_format = ? AND #{CustomValue.table_name}.customized_type = ? AND #{CustomValue.table_name}.customized_id IN (?) AND STR_TO_DATE(#{CustomValue.table_name}.value, '%Y-%m-%d') BETWEEN ? AND ?",
+                events += CustomValue.includes(:custom_field).where([ "#{CustomField.table_name}.field_format = ? AND #{CustomValue.table_name}.customized_type = ? AND #{CustomValue.table_name}.customized_id IN (?) AND STR_TO_DATE(#{CustomValue.table_name}.value, '%Y-%m-%d') BETWEEN ? AND ?",
                                                                   'date', 'Issue', issue_ids, @calendar.startdt, @calendar.enddt ])
 
                 project_ids = @project ? [ @project.id ] : Project.visible.all.collect(&:id)
-                events += CustomValue.find(:all, :include => :custom_field,
-                                                 :conditions => [ "#{CustomField.table_name}.field_format = ? AND #{CustomValue.table_name}.customized_type = ? AND #{CustomValue.table_name}.customized_id IN (?) AND STR_TO_DATE(#{CustomValue.table_name}.value, '%Y-%m-%d') BETWEEN ? AND ?",
+                events += CustomValue.includes(:custom_field).where(["#{CustomField.table_name}.field_format = ? AND #{CustomValue.table_name}.customized_type = ? AND #{CustomValue.table_name}.customized_id IN (?) AND STR_TO_DATE(#{CustomValue.table_name}.value, '%Y-%m-%d') BETWEEN ? AND ?",
                                                                   'date', 'Project', project_ids, @calendar.startdt, @calendar.enddt ])
 
                 version_ids = @project ? @project.versions.collect(&:id) : Version.visible.all.collect(&:id)
-                events += CustomValue.find(:all, :include => :custom_field,
-                                                 :conditions => [ "#{CustomField.table_name}.field_format = ? AND #{CustomValue.table_name}.customized_type = ? AND #{CustomValue.table_name}.customized_id IN (?) AND STR_TO_DATE(#{CustomValue.table_name}.value, '%Y-%m-%d') BETWEEN ? AND ?",
+                events += CustomValue.includes(:custom_field).where([ "#{CustomField.table_name}.field_format = ? AND #{CustomValue.table_name}.customized_type = ? AND #{CustomValue.table_name}.customized_id IN (?) AND STR_TO_DATE(#{CustomValue.table_name}.value, '%Y-%m-%d') BETWEEN ? AND ?",
                                                                   'date', 'Version', version_ids, @calendar.startdt, @calendar.enddt ])
 
                 @calendar.events = events