diff options
| author | Go MAEDA <maeda@farend.jp> | 2020-04-27 06:19:26 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2020-04-27 06:19:26 +0000 |
| commit | 953fce3c95d383a85c8d9dd7dd8f3865ffca8515 (patch) | |
| tree | a1a3d67ea94e057250ec4031292e91dd2cc24d4d | |
| parent | ee46c3570ec5f3948a94adedfdefd734822f95af (diff) | |
| download | redmine-953fce3c95d383a85c8d9dd7dd8f3865ffca8515.tar.gz redmine-953fce3c95d383a85c8d9dd7dd8f3865ffca8515.zip | |
Fix time entry user is shown twice in the User drop-down (#33341).
Patch by Thomas Löber and Marius BALTEANU.
git-svn-id: http://svn.redmine.org/redmine/trunk@19727 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/helpers/timelog_helper.rb | 2 | ||||
| -rw-r--r-- | test/functional/timelog_controller_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb index 6fa0e0442..31b8705c0 100644 --- a/app/helpers/timelog_helper.rb +++ b/app/helpers/timelog_helper.rb @@ -44,7 +44,7 @@ module TimelogHelper def user_collection_for_select_options(time_entry) collection = time_entry.assignable_users - collection << time_entry.user unless time_entry.user.nil? && !collection.include?(time_entry.user) + collection << time_entry.user if time_entry.user && !collection.include?(time_entry.user) principals_options_for_select(collection, time_entry.user_id.to_s) end diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb index ae8a692f0..3b7e10bde 100644 --- a/test/functional/timelog_controller_test.rb +++ b/test/functional/timelog_controller_test.rb @@ -226,7 +226,7 @@ class TimelogControllerTest < Redmine::ControllerTest assert_response :success assert_select 'select[name=?]', 'time_entry[user_id]' do - assert_select 'option[value="2"][selected=selected]' + assert_select 'option[value="2"][selected=selected]', 1 end end |