Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-29 16:50:54 +02:00
Code Issues Packages Projects Releases Activity

Merged r21371 from trunk to 4.2-stable (#20018).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/4.2-stable@21388 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2022-01-29 06:19:31 +00:00
parent 00c0e38499
commit 0a2a3f554b
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/redmine/helpers/time_report.rb
View File

@@ -123,7 +123,7 @@ module Redmine
'tracker' => {:sql => "#{Issue.table_name}.tracker_id",
:klass => Tracker,
:label => :label_tracker},
'activity' => {:sql => "#{TimeEntry.table_name}.activity_id",
'activity' => {:sql => "COALESCE(#{TimeEntryActivity.table_name}.parent_id, #{TimeEntryActivity.table_name}.id)",
:klass => TimeEntryActivity,
:label => :field_activity},
'issue' => {:sql => "#{TimeEntry.table_name}.issue_id",

13
test/functional/timelog_report_test.rb
View File

@@ -224,6 +224,19 @@ class TimelogReportTest < Redmine::ControllerTest
assert_select 'td', :text => 'New'
end
def test_report_activity_criterion_should_aggregate_system_activity_and_project_activity
activity = TimeEntryActivity.create!(:name => 'Design', :parent_id => 9, :project_id => 3)
TimeEntry.generate!(:project_id => 3, :issue_id => 5, :activity_id => activity.id, :spent_on => '2007-05-23', :hours => 10.0)
get :report, :params => {:project_id => 1, :criteria => ['activity']}
assert_response :success
assert_select 'tr.last-level:first' do
assert_select 'td.name', :text => 'Design'
assert_select 'td.hours:last', :text => '165.25'
end
end
def test_report_all_projects_csv_export
get :report, :params => {
:columns => 'month',