From 131184e99a43b0aa0c8d811df32c9ca4f028e0b6 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 16 Nov 2019 10:25:45 +0000 Subject: [PATCH] Reverts r19064 (#32436). git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19078 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/time_entry_query.rb | 2 +- test/functional/timelog_controller_test.rb | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/app/models/time_entry_query.rb b/app/models/time_entry_query.rb index 99d4f667a..a51601620 100644 --- a/app/models/time_entry_query.rb +++ b/app/models/time_entry_query.rb @@ -30,7 +30,7 @@ class TimeEntryQuery < Query QueryColumn.new(:author, :sortable => lambda {User.fields_for_order_statement}), QueryColumn.new(:user, :sortable => lambda {User.fields_for_order_statement}, :groupable => true), QueryColumn.new(:activity, :sortable => "#{TimeEntryActivity.table_name}.position", :groupable => true), - QueryColumn.new(:issue, :sortable => "#{Issue.table_name}.id", :groupable => true), + QueryColumn.new(:issue, :sortable => "#{Issue.table_name}.id"), QueryAssociationColumn.new(:issue, :tracker, :caption => :field_tracker, :sortable => "#{Tracker.table_name}.position"), QueryAssociationColumn.new(:issue, :status, :caption => :field_status, :sortable => "#{IssueStatus.table_name}.position"), QueryAssociationColumn.new(:issue, :category, :caption => :field_category, :sortable => "#{IssueCategory.table_name}.name"), diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb index 9c0b958b9..f23a10c10 100644 --- a/test/functional/timelog_controller_test.rb +++ b/test/functional/timelog_controller_test.rb @@ -1418,18 +1418,4 @@ class TimelogControllerTest < Redmine::ControllerTest assert_select '+ span.count', :text => '2' end end - - def test_index_grouped_by_issue - get :index, :params => { - :set_filter => 1, - :group_by => 'issue' - } - assert_response :success - - assert_select 'tr.group span.name' do |elements| - target_element = elements[1] - assert_equal "Bug #1: Cannot print recipes", target_element.text - assert_select target_element, '+ span.count', :text => '2' - end - end end -- 2.39.5