From 4a447dda0988c52e3c552f1e8f08a9bd1c315a2b Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 10 Nov 2019 07:56:47 +0000 Subject: [PATCH] Add support for grouping by issue on timelog view (#32436). Patch by Kouhei Sutou. git-svn-id: http://svn.redmine.org/redmine/trunk@19063 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/time_entry_query.rb | 2 +- test/functional/timelog_controller_test.rb | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/models/time_entry_query.rb b/app/models/time_entry_query.rb index a51601620..99d4f667a 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"), + QueryColumn.new(:issue, :sortable => "#{Issue.table_name}.id", :groupable => true), 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 f23a10c10..9c0b958b9 100644 --- a/test/functional/timelog_controller_test.rb +++ b/test/functional/timelog_controller_test.rb @@ -1418,4 +1418,18 @@ 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