Index: app/models/issue_query.rb =================================================================== --- app/models/issue_query.rb (Revision 16970) +++ app/models/issue_query.rb (Arbeitskopie) @@ -272,7 +272,7 @@ # Returns the issues # Valid options are :order, :offset, :limit, :include, :conditions def issues(options={}) - order_option = [group_by_sort_order, (options[:order] || sort_clause)].flatten.reject(&:blank?) + order_option = ([options[:order]] || [group_by_sort_order, sort_clause]).flatten.reject(&:blank?) scope = Issue.visible. joins(:status, :project). Index: app/controllers/calendars_controller.rb =================================================================== --- app/controllers/calendars_controller.rb (Revision 16970) +++ app/controllers/calendars_controller.rb (Arbeitskopie) @@ -38,11 +38,11 @@ @calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month) retrieve_query - @query.group_by = 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] + :conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt], + :order => [] ) events += @query.versions(:conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt]) Index: app/controllers/gantts_controller.rb =================================================================== --- app/controllers/gantts_controller.rb (Revision 16970) +++ app/controllers/gantts_controller.rb (Arbeitskopie) @@ -32,7 +32,6 @@ @gantt = Redmine::Helpers::Gantt.new(params) @gantt.project = @project retrieve_query - @query.group_by = nil @gantt.query = @query if @query.valid? basename = (@project ? "#{@project.identifier}-" : '') + 'gantt'