diff options
| -rw-r--r-- | app/models/time_entry_import.rb | 3 | ||||
| -rw-r--r-- | test/unit/time_entry_import_test.rb | 16 |
2 files changed, 11 insertions, 8 deletions
diff --git a/app/models/time_entry_import.rb b/app/models/time_entry_import.rb index df8233d6e..e8681fc02 100644 --- a/app/models/time_entry_import.rb +++ b/app/models/time_entry_import.rb @@ -94,7 +94,7 @@ class TimeEntryImport < Import end user_id = nil - if User.current.allowed_to?(:log_time_for_other_users, project) + if user.allowed_to?(:log_time_for_other_users, project) if user_value user_id = user_value elsif user_name = row_value(row, 'user') @@ -107,6 +107,7 @@ class TimeEntryImport < Import attributes = { :project_id => project.id, :activity_id => activity_id, + :author_id => user.id, :user_id => user_id, :issue_id => row_value(row, 'issue_id'), diff --git a/test/unit/time_entry_import_test.rb b/test/unit/time_entry_import_test.rb index b56e59267..0d4a53940 100644 --- a/test/unit/time_entry_import_test.rb +++ b/test/unit/time_entry_import_test.rb @@ -127,7 +127,8 @@ class TimeEntryImportTest < ActiveSupport::TestCase end def test_maps_user_id_for_user_with_permissions - User.current = User.find(1) + Role.find_by_name('Manager').add_permission! :log_time_for_other_users + import = generate_import_with_mapping first, second, third, fourth = new_records(TimeEntry, 4) { import.run } @@ -138,16 +139,17 @@ class TimeEntryImportTest < ActiveSupport::TestCase end def test_maps_user_to_column_value - User.current = User.find(1) + Role.find_by_name('Manager').add_permission! :log_time_for_other_users + import = generate_import_with_mapping - import.mapping.merge!('user' => 'value:1') + import.mapping.merge!('user' => 'value:3') import.save! first, second, third, fourth = new_records(TimeEntry, 4) { import.run } - assert_equal 1, first.user_id - assert_equal 1, second.user_id - assert_equal 1, third.user_id - assert_equal 1, fourth.user_id + assert_equal 3, first.user_id + assert_equal 3, second.user_id + assert_equal 3, third.user_id + assert_equal 3, fourth.user_id end def test_maps_user_id_for_user_without_permissions |