diff --git a/app/views/timelog/_form.html.erb b/app/views/timelog/_form.html.erb index 874ab02b8..48db3f27a 100644 --- a/app/views/timelog/_form.html.erb +++ b/app/views/timelog/_form.html.erb @@ -2,25 +2,25 @@ <%= back_url_hidden_field_tag %>
<%= f.select :project_id, project_tree_options_for_select(Project.allowed_to(:log_time).all, :selected => @time_entry.project), :required => true %>
- <% end %> - <% end %> -+ <% if @time_entry.new_record? %> + <% if params[:project_id] || @time_entry.issue %> + <%= f.hidden_field :project_id %> + <% else %> +
<%= f.select :project_id, project_tree_options_for_select(Project.allowed_to(:log_time).all, :selected => @time_entry.project), :required => true %>
+ <% end %> + <% end %> +<%= f.text_field :issue_id, :size => 6 %> <%= h("#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}") if @time_entry.issue %>
-<%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %>
-<%= f.text_field :hours, :size => 6, :required => true %>
-<%= f.text_field :comments, :size => 100 %>
-<%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %>
- <% @time_entry.custom_field_values.each do |value| %> -<%= custom_field_tag_with_label :time_entry, value %>
- <% end %> - <%= call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f }) %> +<%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %>
+<%= f.text_field :hours, :size => 6, :required => true %>
+<%= f.text_field :comments, :size => 100 %>
+<%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %>
+ <% @time_entry.custom_field_values.each do |value| %> +<%= custom_field_tag_with_label :time_entry, value %>
+ <% end %> + <%= call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f }) %>