Time Entry Import fails to import custom fields with "User" format (#38254).

Patch by Jens Krämer.


git-svn-id: https://svn.redmine.org/redmine/trunk@22112 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 35 insertions, 0 deletions

diff --git a/app/models/time_entry_import.rb b/app/models/time_entry_import.rb
index 1659e6efa..a6dfee53c 100644
--- a/app/models/time_entry_import.rb
+++ b/app/models/time_entry_import.rb
@@ -116,8 +116,10 @@ class TimeEntryImport < Import
 
     if issue_id = row_value(row, 'issue_id').presence
       attributes[:issue_id] = issue_id
+      object.project = issue_project(issue_id)
     else
       attributes[:project_id] = project.id
+      object.project = project
     end
 
     attributes['custom_field_values'] = object.custom_field_values.inject({}) do |h, v|
@@ -137,4 +139,10 @@ class TimeEntryImport < Import
     object.send(:safe_attributes=, attributes, user)
     object
   end
+
+  def issue_project(issue_id)
+    if issue_project_id = Issue.where(id: issue_id).limit(1).pick(:project_id)
+      (@projects_cache ||= {})[issue_project_id] ||= allowed_target_projects.find_by_id(issue_project_id)
+    end
+  end
 end
diff --git a/test/unit/time_entry_import_test.rb b/test/unit/time_entry_import_test.rb
index 3766f12cb..f2feb275c 100644
--- a/test/unit/time_entry_import_test.rb
+++ b/test/unit/time_entry_import_test.rb
@@ -187,6 +187,33 @@ class TimeEntryImportTest < ActiveSupport::TestCase
     assert_equal 1, fourth.project_id
   end
 
+  def test_imports_custom_field_with_user_format
+    cf = TimeEntryCustomField.create! name: 'User Field', field_format: 'user'
+    import = generate_import
+    import.settings = {
+      'separator' => ';', 'wrapper' => '"', 'encoding' => 'UTF-8',
+      'mapping' => {
+        'project_id' => '1',
+        'activity'   => 'value:10',
+        'issue_id'   => '1',
+        'spent_on'   => '2',
+        'hours'      => '3',
+        'comments'   => '4',
+        'user'       => '7',
+        "cf_#{cf.id}" => '7'
+      }
+    }
+    import.save!
+    first, second, third, fourth = new_records(TimeEntry, 4) {import.run}
+    jsmith = User.find_by_login 'jsmith'
+    dlopper = User.find_by_login 'dlopper'
+
+    assert_equal dlopper.id, third.custom_values.where(custom_field: cf.id).first.value.to_i
+    assert_equal jsmith.id, fourth.custom_values.where(custom_field: cf.id).first.value.to_i
+    assert_equal jsmith.id, first.custom_values.where(custom_field: cf.id).first.value.to_i
+    assert_equal jsmith.id, second.custom_values.where(custom_field: cf.id).first.value.to_i
+  end
+
   protected
 
   def generate_import(fixture_name='import_time_entries.csv')