Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@19653 e93f8b46-1217-0410-a6f0-8f06a7374b81tags/4.2.0
@@ -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> |
@@ -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 |