| @@ -339,11 +339,10 class IssuesController < ApplicationController | |||||
| 339 | :include => [:tracker, :status, :assigned_to, :priority, :project, :fixed_version], |
|
339 | :include => [:tracker, :status, :assigned_to, :priority, :project, :fixed_version], | |
| 340 | :conditions => ["(#{@query.statement}) AND (((start_date>=? and start_date<=?) or (effective_date>=? and effective_date<=?) or (start_date<? and effective_date>?)) and start_date is not null and due_date is null and effective_date is not null)", @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to] |
|
340 | :conditions => ["(#{@query.statement}) AND (((start_date>=? and start_date<=?) or (effective_date>=? and effective_date<=?) or (start_date<? and effective_date>?)) and start_date is not null and due_date is null and effective_date is not null)", @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to] | |
| 341 | ) |
|
341 | ) | |
| 342 |
# |
|
342 | # Versions | |
| 343 | version_ids = events.collect(&:fixed_version_id).compact.uniq |
|
343 | events += Version.find(:all, :include => :project, | |
| 344 | events += Version.find_all_by_id(version_ids, :include => :project, |
|
344 | :conditions => ["(#{@query.project_statement}) AND effective_date BETWEEN ? AND ?", @gantt.date_from, @gantt.date_to]) | |
| 345 | :conditions => ["effective_date BETWEEN ? AND ?", @gantt.date_from, @gantt.date_to]) unless version_ids.empty? |
|
345 | ||
| 346 |
|
||||
| 347 | @gantt.events = events |
|
346 | @gantt.events = events | |
| 348 | end |
|
347 | end | |
| 349 |
|
348 | |||
General Comments 0
You need to be logged in to leave comments.
Login now