meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-18 06:58:17 +00:00
Code Issues Releases Wiki Activity

Merged r17658 and r17659 to 3.4-stable (#30001).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17664 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2018-11-29 19:12:53 +00:00
parent 8e072c4877
commit 1b8d448b82
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/issue_import.rb
View File

@ -122,7 +122,10 @@ class IssueImport < Import
end end
end end
if issue.project && version_name = row_value(row, 'fixed_version') if issue.project && version_name = row_value(row, 'fixed_version')
if version = issue.project.versions.named(version_name).first version =
issue.project.versions.named(version_name).first ||
issue.project.shared_versions.named(version_name).first
if version
attributes['fixed_version_id'] = version.id attributes['fixed_version_id'] = version.id
elsif create_versions? elsif create_versions?
version = issue.project.versions.build version = issue.project.versions.build

12
test/unit/issue_import_test.rb
View File

@ -188,4 +188,16 @@ class IssueImportTest < ActiveSupport::TestCase
import.run import.run
assert !File.exists?(file_path) assert !File.exists?(file_path)
end end
def test_run_should_consider_project_shared_versions
system_version = Version.generate!(:project_id => 2, :sharing => 'system', :name => '2.1')
system_version.save!
import = generate_import_with_mapping
import.mapping.merge!('fixed_version' => '9')
import.save!
issues = new_records(Issue, 3) { import.run }
assert [nil, 3, system_version.id], issues.map(&:fixed_version_id)
end
end end