meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-22 16:31:12 +00:00
Code Issues Releases Wiki Activity

shorten long line of CalendarsController

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@20026 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2020-09-12 12:58:22 +00:00
parent 48999442c4
commit 24bbee41d9
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/controllers/calendars_controller.rb
View File

@ -44,11 +44,16 @@ class CalendarsController < ApplicationController
@query.sort_criteria = nil @query.sort_criteria = nil
if @query.valid? if @query.valid?
events = [] events = []
events += @query.issues(:include => [:tracker, :assigned_to, :priority], events += @query.issues(
:conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt] :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.versions(:conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
@calendar.events = events @calendar.events = events
end end