summaryrefslogtreecommitdiffstats
path: root/app/helpers
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2020-04-05 08:21:25 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2020-04-05 08:21:25 +0000
commite91dbcb5a707db117f896ae099480b99b0805b00 (patch)
tree80417c2042d692efa983f9897f306c6b5502b4aa /app/helpers
parent214ec3e80655da61874fe0557849cfef8b063fdb (diff)
downloadredmine-e91dbcb5a707db117f896ae099480b99b0805b00.tar.gz
redmine-e91dbcb5a707db117f896ae099480b99b0805b00.zip
Editing a time entry for a locked user changes the user to the current user (#32973).
Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@19651 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/timelog_helper.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb
index fe5acb8f6..6fa0e0442 100644
--- a/app/helpers/timelog_helper.rb
+++ b/app/helpers/timelog_helper.rb
@@ -44,6 +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)
principals_options_for_select(collection, time_entry.user_id.to_s)
end