Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-04-01 10:10:56 +02:00
Code Issues Packages Projects Releases Activity

Merged r22833 to 5.1-stable (#40693).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@22836 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2024-05-18 04:58:15 +00:00
parent 6e5bf96afd
commit 347e21ead8
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/project.rb
View File

@@ -492,6 +492,7 @@ class Project < ActiveRecord::Base
def rolled_up_statuses
issue_status_ids = WorkflowTransition.
where(:tracker_id => rolled_up_trackers.map(&:id)).
where('old_status_id <> new_status_id').
distinct.
pluck(:old_status_id, :new_status_id).
flatten.

2
test/functional/reports_controller_test.rb
View File

@@ -107,6 +107,8 @@ class ReportsControllerTest < Redmine::ControllerTest
WorkflowTransition.create(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 4)
WorkflowTransition.create(:role_id => 1, :tracker_id => 1, :old_status_id => 2, :new_status_id => 5)
WorkflowTransition.create(:role_id => 1, :tracker_id => 2, :old_status_id => 1, :new_status_id => 6)
WorkflowTransition.create(:role_id => 1, :tracker_id => 2, :old_status_id => 3, :new_status_id => 3)
with_settings :display_subprojects_issues => '0' do
get(:issue_report_details, :params => {:id => 1, :detail => 'tracker'})
end

2
test/unit/project_test.rb
View File

@@ -534,6 +534,8 @@ class ProjectTest < ActiveSupport::TestCase
WorkflowTransition.create(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 4)
WorkflowTransition.create(:role_id => 1, :tracker_id => 1, :old_status_id => 2, :new_status_id => 3)
WorkflowTransition.create(:role_id => 1, :tracker_id => 2, :old_status_id => 1, :new_status_id => 3)
WorkflowTransition.create(:role_id => 1, :tracker_id => 1, :old_status_id => 5, :new_status_id => 5)
WorkflowTransition.create(:role_id => 1, :tracker_id => 2, :old_status_id => 5, :new_status_id => 5)
assert_kind_of IssueStatus, project.rolled_up_statuses.first
assert_equal IssueStatus.find(1), project.rolled_up_statuses.first