From 24bbee41d9430f4227740fe6c0aa4faa9afeafe8 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sat, 12 Sep 2020 12:58:22 +0000 Subject: [PATCH] shorten long line of CalendarsController git-svn-id: http://svn.redmine.org/redmine/trunk@20026 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/calendars_controller.rb | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb index eec3bf2c1..56f5207b4 100644 --- a/app/controllers/calendars_controller.rb +++ b/app/controllers/calendars_controller.rb @@ -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 -- 2.39.5