summaryrefslogtreecommitdiffstats
path: root/app/views/timelog
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2020-04-05 08:29:15 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2020-04-05 08:29:15 +0000
commit9fcfeb1b363cefa8ecf710e3bdcc4c0f79e517cd (patch)
treebb1d4b8958764c47f8e39300f2ae53562d96228e /app/views/timelog
parent2b122d2b650c4164d21d753e3121c8700739569f (diff)
downloadredmine-9fcfeb1b363cefa8ecf710e3bdcc4c0f79e517cd.tar.gz
redmine-9fcfeb1b363cefa8ecf710e3bdcc4c0f79e517cd.zip
Editing time entries should show the time entry user (#3800).
Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@19653 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/timelog')
-rw-r--r--app/views/timelog/_form.html.erb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/views/timelog/_form.html.erb b/app/views/timelog/_form.html.erb
index bfeb67337..24bce8b6d 100644
--- a/app/views/timelog/_form.html.erb
+++ b/app/views/timelog/_form.html.erb
@@ -16,8 +16,14 @@
<%= link_to_issue(@time_entry.issue) if @time_entry.issue.try(:visible?) %>
</span>
</p>
+
<% if User.current.allowed_to?(:log_time_for_other_users, @project) %>
<p><%= f.select :user_id, user_collection_for_select_options(@time_entry), :required => true %></p>
+ <% elsif !@time_entry.new_record? %>
+ <p>
+ <%= f.label_for_field :user_id %>
+ <span><%= link_to_user(@time_entry.user) %></span>
+ </p>
<% end %>
<p><%= f.date_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
<p><%= f.hours_field :hours, :size => 6, :required => true %></p>