From 66d0636fffaf7f27be63081180ba53fd515d9377 Mon Sep 17 00:00:00 2001
From: Marius BALTEANU
<%= f.select :user_id, user_collection_for_select_options(@time_entry), :required => true %>
+ <% elsif !@time_entry.new_record? %> ++ <%= f.label_for_field :user_id %> + <%= link_to_user(@time_entry.user) %> +
<% end %><%= f.date_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %>
<%= f.hours_field :hours, :size => 6, :required => true %>
diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb index b57dfb8c3..61ef00d8e 100644 --- a/test/functional/timelog_controller_test.rb +++ b/test/functional/timelog_controller_test.rb @@ -46,6 +46,8 @@ class TimelogControllerTest < Redmine::ControllerTest # blank option for project assert_select 'option[value=""]' end + assert_select 'label[for=?]', 'time_entry_user_id', 0 + assert_select 'select[name=?]', 'time_entry[user_id]', 0 end def test_new_with_project_id @@ -150,6 +152,11 @@ class TimelogControllerTest < Redmine::ControllerTest assert_response :success assert_select 'form[action=?]', '/time_entries/2' + + # Time entry user should be shown as text + # for user without permission to log time for other users + assert_select 'label[for=?]', 'time_entry_user_id', 1 + assert_select 'a.user.active', :text => 'Redmine Admin' end def test_get_edit_with_an_existing_time_entry_with_inactive_activity -- 2.22.0