]> source.dussan.org Git - redmine.git/commitdiff
Custom query breaks calendar view with error 500 (#27153).
authorJean-Philippe Lang <jp_lang@yahoo.fr>
Sun, 7 Jan 2018 22:28:08 +0000 (22:28 +0000)
committerJean-Philippe Lang <jp_lang@yahoo.fr>
Sun, 7 Jan 2018 22:28:08 +0000 (22:28 +0000)
Patch by Bernhard Rohloff.

git-svn-id: http://svn.redmine.org/redmine/trunk@17155 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/controllers/calendars_controller.rb

index 8193ef4fcc62d8034f65f5c7242e52e7f1856551..e07ba2e614b749d09512685ef35c37c17c8cd260 100644 (file)
@@ -39,6 +39,7 @@ class CalendarsController < ApplicationController
     @calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month)
     retrieve_query
     @query.group_by = nil
+    @query.sort_criteria = nil
     if @query.valid?
       events = []
       events += @query.issues(:include => [:tracker, :assigned_to, :priority],