diff --git a/app/models/issue.rb b/app/models/issue.rb index 868b218310..86732ac624 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -626,9 +626,10 @@ class Issue < ApplicationRecord if new_record? && !statuses_allowed.include?(status) self.status = statuses_allowed.first || default_status end - # Use the selected tracker's private default when the form has no explicit value. + @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? && - !attrs.key?('is_private') && safe_attribute?('is_private', user) + !@is_private_specified && safe_attribute?('is_private', user) attrs['is_private'] = '1' end if attrs.key?('assigned_to_id') diff --git a/app/models/issue_import.rb b/app/models/issue_import.rb index 57305e38f6..07a2644655 100644 --- a/app/models/issue_import.rb +++ b/app/models/issue_import.rb @@ -172,9 +172,7 @@ class IssueImport < Import end end if is_private = row_value(row, 'is_private') - if yes?(is_private) - attributes['is_private'] = '1' - end + attributes['is_private'] = yes?(is_private) ? '1' : '0' end if parent_issue_id = row_value(row, 'parent_issue_id') if parent_issue_id.start_with? '#' diff --git a/test/unit/issue_import_test.rb b/test/unit/issue_import_test.rb index de42070451..b6c9cc4e4c 100644 --- a/test/unit/issue_import_test.rb +++ b/test/unit/issue_import_test.rb @@ -338,6 +338,17 @@ class IssueImportTest < ActiveSupport::TestCase assert_equal [false, true, false], issues.map(&:is_private) end + def test_is_private_column_should_override_tracker_private_by_default_setting + Tracker.update_all(:private_by_default => true) + Role.find(1).add_permission! :set_issues_private + import = generate_import_with_mapping + import.mapping['is_private'] = '6' + import.save! + + issues = new_records(Issue, 3) {import.run} + assert_equal [false, true, false], issues.map(&:is_private) + end + def test_dates_should_be_parsed_using_date_format_setting field = IssueCustomField.generate!(:field_format => 'date', :is_for_all => true, :trackers => Tracker.all) import = generate_import_with_mapping('import_dates.csv') diff --git a/test/unit/mail_handler_test.rb b/test/unit/mail_handler_test.rb index 5687ef84e1..cf552be401 100644 --- a/test/unit/mail_handler_test.rb +++ b/test/unit/mail_handler_test.rb @@ -180,6 +180,21 @@ class MailHandlerTest < ActiveSupport::TestCase assert_equal true, issue.reload.is_private end + def test_add_issue_with_private_keyword_no_should_override_tracker_private_by_default_setting + User.find_by_mail('jsmith@somenet.foo').update_attribute 'language', 'fr' + MemberRole.create! member_id: 3, role_id: 1 + Project.find(2).trackers.update_all(:private_by_default => true) + + issue = + submit_email( + 'ticket_with_localized_private_flag.eml', + :allow_override => 'is_private,tracker,category,priority' + ) {|email| email.sub!('oui', 'non')} + assert issue.is_a?(Issue) + assert_not issue.new_record? + assert_equal false, issue.reload.is_private + end + def test_add_issue_with_group_assignment with_settings :issue_group_assignment => '1' do issue = submit_email('ticket_on_given_project.eml', :allow_override => ['assigned_to']) do |email|