Browse Source

shorten long line of CalendarsController

git-svn-id: http://svn.redmine.org/redmine/trunk@20026 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/4.2.0
Toshi MARUYAMA 3 years ago
parent
commit
24bbee41d9
1 changed files with 10 additions and 5 deletions
  1. 10
    5
      app/controllers/calendars_controller.rb

+ 10
- 5
app/controllers/calendars_controller.rb View File

@@ -44,11 +44,16 @@ 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


Loading…
Cancel
Save