| 26 |
26 |
@query.group_by = nil
|
| 27 |
27 |
if @query.valid?
|
| 28 |
28 |
events = []
|
| 29 |
|
events += @query.issues(:include => [ :tracker, :assigned_to, :priority ],
|
| 30 |
|
:conditions => [ "((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt ])
|
| 31 |
|
events += @query.versions(:conditions => [ "effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt ])
|
|
29 |
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 ])
|
|
30 |
events += @query.versions.where([ "effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt ])
|
| 32 |
31 |
|
| 33 |
32 |
issue_ids = @query.respond_to?(:issue_ids) ? @query.issue_ids : @query.issues.collect(&:id)
|
| 34 |
|
events += CustomValue.find(:all, :include => :custom_field,
|
| 35 |
|
: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 ?",
|
|
33 |
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 ?",
|
| 36 |
34 |
'date', 'Issue', issue_ids, @calendar.startdt, @calendar.enddt ])
|
| 37 |
35 |
|
| 38 |
36 |
project_ids = @project ? [ @project.id ] : Project.visible.all.collect(&:id)
|
| 39 |
|
events += CustomValue.find(:all, :include => :custom_field,
|
| 40 |
|
: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 ?",
|
|
37 |
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 ?",
|
| 41 |
38 |
'date', 'Project', project_ids, @calendar.startdt, @calendar.enddt ])
|
| 42 |
39 |
|
| 43 |
40 |
version_ids = @project ? @project.versions.collect(&:id) : Version.visible.all.collect(&:id)
|
| 44 |
|
events += CustomValue.find(:all, :include => :custom_field,
|
| 45 |
|
: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 ?",
|
|
41 |
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 ?",
|
| 46 |
42 |
'date', 'Version', version_ids, @calendar.startdt, @calendar.enddt ])
|
| 47 |
43 |
|
| 48 |
44 |
@calendar.events = events
|