Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-01-17 21:12:55 +01:00
Code Issues Packages Projects Releases Activity

Fix wrong variable name in Import#set_default_settings (#34718).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@21354 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2022-01-07 10:06:28 +00:00
parent e00f28e82e
commit 4fbbcf3cdf
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/import.rb
View File

@@ -72,7 +72,7 @@ class Import < ActiveRecord::Base
separator = [',', ';'].max_by {|sep| content.count(sep)}
guessed_encoding = Redmine::CodesetUtil.guess_encoding(file_content)
guessed_encoding = Redmine::CodesetUtil.guess_encoding(content)
encoding =
(guessed_encoding && (
Setting::ENCODINGS.detect {|e| e.casecmp?(guessed_encoding)} ||

3
test/unit/issue_import_test.rb
View File

@@ -414,6 +414,9 @@ class IssueImportTest < ActiveSupport::TestCase
def test_set_default_settings_should_guess_encoding
import = generate_import('import_iso8859-1.csv')
user = User.generate!(:language => 'ja')
import.user = user
assert_equal 'CP932', lu(user, :general_csv_encoding)
with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
import.set_default_settings
guessed_encoding = import.settings['encoding']