summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2018-01-07 22:28:08 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2018-01-07 22:28:08 +0000
commit747e183a6b4043d119f5ef48969729952d38e03f (patch)
tree29d4d9cd9ceeac424e1e9c8e465c0642672f0963
parent27cd7f478b64d72e14c7ab07e05f7fde5b828d06 (diff)
downloadredmine-747e183a6b4043d119f5ef48969729952d38e03f.tar.gz
redmine-747e183a6b4043d119f5ef48969729952d38e03f.zip
Custom query breaks calendar view with error 500 (#27153).
Patch by Bernhard Rohloff. git-svn-id: http://svn.redmine.org/redmine/trunk@17155 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/controllers/calendars_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb
index 8193ef4fc..e07ba2e61 100644
--- a/app/controllers/calendars_controller.rb
+++ b/app/controllers/calendars_controller.rb
@@ -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],