Allow imported time entries to override the selected project with the actual project...

Patch by Jens Krämer.

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

diff --git a/app/models/time_entry_import.rb b/app/models/time_entry_import.rb
index 27b9e040fdf55e53d92ee45e3ecceb644dd7a233..3f4fdbbc6fc9b9244678ce4f7379bcbe00fb8374 100644 (file)
--- a/app/models/time_entry_import.rb
+++ b/app/models/time_entry_import.rb
@@ -105,17 +105,21 @@ class TimeEntryImport < Import
     end
 
     attributes = {
-      :project_id  => project.id,
       :activity_id => activity_id,
       :author_id   => user.id,
       :user_id     => user_id,
 
-      :issue_id    => row_value(row, 'issue_id'),
       :spent_on    => row_date(row, 'spent_on'),
       :hours       => row_value(row, 'hours'),
       :comments    => row_value(row, 'comments')
     }
 
+    if issue_id = row_value(row, 'issue_id').presence
+      attributes[:issue_id] = issue_id
+    else
+      attributes[:project_id] = project.id
+    end
+
     attributes['custom_field_values'] = object.custom_field_values.inject({}) do |h, v|
       value =
         case v.custom_field.field_format

diff --git a/test/unit/time_entry_import_test.rb b/test/unit/time_entry_import_test.rb
index f0ec41cb71b6f1fee159b9e520848f5954f3acc4..36e7f574df86c5237673cc1531fabbdc018d7a4f 100644 (file)
--- a/test/unit/time_entry_import_test.rb
+++ b/test/unit/time_entry_import_test.rb
@@ -165,6 +165,28 @@ class TimeEntryImportTest < ActiveSupport::TestCase
     assert_equal 2, fourth.user_id
   end
 
+  def test_imports_timelogs_for_issues_in_other_project
+    import = generate_import
+    import.settings = {
+      'separator' => ';', 'wrapper' => '"', 'encoding' => 'UTF-8',
+      'mapping' => {
+        'project_id' => '3',
+        'activity'   => 'value:10',
+        'issue_id'   => '1',
+        'spent_on'   => '2',
+        'hours'      => '3',
+        'comments'   => '4',
+        'user'       => '7'
+      }
+    }
+    import.save!
+    first, second, third, fourth = new_records(TimeEntry, 4) {import.run}
+    assert_equal 3, first.project_id
+    assert_equal 3, second.project_id
+    assert_equal 1, third.project_id
+    assert_equal 1, fourth.project_id
+  end
+
   protected
 
   def generate_import(fixture_name='import_time_entries.csv')