diff --git a/app/models/issue.rb b/app/models/issue.rb index 86732ac624..9d622771e7 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -627,8 +627,8 @@ class Issue < ApplicationRecord self.status = statuses_allowed.first || default_status end @is_private_specified = true if attrs.key?('is_private') - # Use the selected tracker's private default when no value has been specified. - if new_record? && tracker&.private_by_default? && + # Use the selected tracker's private default when no value has been specified, except for copies. + if new_record? && !copy? && tracker&.private_by_default? && !@is_private_specified && safe_attribute?('is_private', user) attrs['is_private'] = '1' end diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index 483c92e445..44f168a0e9 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -4389,6 +4389,17 @@ class IssuesControllerTest < Redmine::ControllerTest assert_select 'input[name=?][checked=checked]', 'issue[is_private]' end + def test_new_copy_should_keep_public_flag_of_source_issue_if_tracker_is_private_by_default + Tracker.find(1).update! :private_by_default => true + issue = Issue.generate!(:project_id => 1, :tracker_id => 1, :is_private => false) + @request.session[:user_id] = 2 + get(:new, :params => {:project_id => 1, :copy_from => issue.id}) + assert_response :success + + assert_select 'input[type=checkbox][name=?]', 'issue[is_private]' + assert_select 'input[name=?][checked=checked]', 'issue[is_private]', 0 + end + def test_update_form_for_new_issue_should_apply_private_by_default_when_submitted_private_is_unchecked Tracker.find(2).update! :private_by_default => true @request.session[:user_id] = 2 @@ -8542,6 +8553,23 @@ class IssuesControllerTest < Redmine::ControllerTest assert_response :forbidden end + def test_bulk_copy_should_keep_public_flag_if_tracker_is_private_by_default + Tracker.find(1).update! :private_by_default => true + issue = Issue.generate!(:project_id => 1, :tracker_id => 1, :is_private => false) + @request.session[:user_id] = 2 + assert_difference 'Issue.count', 1 do + post( + :bulk_update, + :params => { + :ids => [issue.id], + :copy => '1', + :issue => {:project_id => '', :tracker_id => '', :is_private => ''} + } + ) + end + assert_equal false, Issue.order(:id => :desc).first.is_private + end + def test_bulk_copy_should_allow_not_changing_the_issue_attributes @request.session[:user_id] = 2 issues = [ diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb index e7763675c8..c1aac30a53 100644 --- a/test/unit/issue_test.rb +++ b/test/unit/issue_test.rb @@ -1417,6 +1417,16 @@ class IssueTest < ActiveSupport::TestCase assert_equal "125", issue.custom_value_for(2).value end + def test_copy_should_keep_is_private_if_tracker_is_private_by_default + Tracker.find(1).update! :private_by_default => true + Role.find(1).add_permission! :set_issues_private + orig = Issue.generate!(:project_id => 1, :tracker_id => 1, :is_private => false) + issue = Issue.new.copy_from(orig) + User.current = User.find(2) + issue.safe_attributes = {'subject' => 'Copy'} + assert_equal false, issue.is_private + end + def test_copy_to_another_project_should_clear_assignee_if_not_valid issue = Issue.generate!(:project_id => 1, :assigned_to_id => 2) project = Project.generate!