]> source.dussan.org Git - redmine.git/commitdiff
fix source indent of CalendarsController
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Mon, 21 Sep 2020 13:03:22 +0000 (13:03 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Mon, 21 Sep 2020 13:03:22 +0000 (13:03 +0000)
git-svn-id: http://svn.redmine.org/redmine/trunk@20056 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/controllers/calendars_controller.rb

index 56f5207b40757c797a4b230bfd4202eb1d6f37e1..ef5f3956f0463709356ac0c75849aeb70c4cfdad 100644 (file)
@@ -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