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

Merged r17786 and r17787 from trunk to 3.4-stable (#30412).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17789 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2019-01-12 01:34:18 +00:00
parent 62412a4e50
commit 1f0a1f65ca
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/import.rb
View File

@ -217,6 +217,7 @@ class Import < ActiveRecord::Base
csv_options = {:headers => false}
csv_options[:encoding] = settings['encoding'].to_s.presence || 'UTF-8'
csv_options[:encoding] = 'bom|UTF-8' if csv_options[:encoding] == 'UTF-8'
separator = settings['separator'].to_s
csv_options[:col_sep] = separator if separator.size == 1
wrapper = settings['wrapper'].to_s

4
test/fixtures/files/import_issues_utf8_with_bom.csv vendored Normal file
View File

@ -0,0 +1,4 @@
"priority";subject;description;start_date;due_date;parent;private;progress;custom;version;category;user;estimated_hours;tracker;status
High;First;First description;2015-07-08;2015-08-25;;no;;PostgreSQL;;New category;dlopper;1;bug;new
Normal;Child 1;Child description;;;1;yes;10;MySQL;2.0;New category;;2;feature request;new
Normal;Child of existing issue;Child description;;;#2;no;20;;2.1;Printing;;3;bug;assigned
1 priority subject description start_date due_date parent private progress custom version category user estimated_hours tracker status
2 High First First description 2015-07-08 2015-08-25 no PostgreSQL New category dlopper 1 bug new
3 Normal Child 1 Child description 1 yes 10 MySQL 2.0 New category 2 feature request new
4 Normal Child of existing issue Child description #2 no 20 2.1 Printing 3 bug assigned

9
test/unit/issue_import_test.rb
View File

@ -115,6 +115,15 @@ class IssueImportTest < ActiveSupport::TestCase
assert_equal 2, issues[2].parent_id
end
def test_import_utf8_with_bom
import = generate_import_with_mapping('import_issues_utf8_with_bom.csv')
import.settings.merge!('encoding' => 'UTF-8')
import.save
issues = new_records(Issue,3) { import.run }
assert_equal 3, issues.count
end
def test_backward_and_forward_reference_to_parent_should_work
import = generate_import('import_subtasks.csv')
import.settings = {