diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/calendars_controller.rb | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb index 56f5207b4..ef5f3956f 100644 --- a/app/controllers/calendars_controller.rb +++ b/app/controllers/calendars_controller.rb @@ -44,16 +44,22 @@ class CalendarsController < ApplicationController @query.sort_criteria = 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( + :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 + ] + ) @calendar.events = events end |