@@ -1,23 +1,32 | |||||
1 | <%= error_messages_for 'time_entry' %> |
|
1 | <%= error_messages_for 'time_entry' %> | |
2 | <%= back_url_hidden_field_tag %> |
|
2 | <%= back_url_hidden_field_tag %> | |
3 |
|
3 | |||
4 | <div class="box tabular"> |
|
4 | <div class="box tabular"> | |
5 | <% if @time_entry.new_record? %> |
|
5 | <% if @time_entry.new_record? %> | |
6 | <% if params[:project_id] || @time_entry.issue %> |
|
6 | <% if params[:project_id] || @time_entry.issue %> | |
7 | <%= f.hidden_field :project_id %> |
|
7 | <%= f.hidden_field :project_id %> | |
8 | <% else %> |
|
8 | <% else %> | |
9 | <p><%= f.select :project_id, project_tree_options_for_select(Project.allowed_to(:log_time).all, :selected => @time_entry.project), :required => true %></p> |
|
9 | <p><%= f.select :project_id, project_tree_options_for_select(Project.allowed_to(:log_time).all, :selected => @time_entry.project), :required => true %></p> | |
10 | <% end %> |
|
10 | <% end %> | |
11 | <% end %> |
|
11 | <% end %> | |
12 | <p><%= f.text_field :issue_id, :size => 6 %> <em><%= h("#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}") if @time_entry.issue %></em></p> |
|
12 | <p> | |
|
13 | <%= f.text_field :issue_id, :size => 6 %> | |||
|
14 | <span id="time_entry_issue"><%= h("#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}") if @time_entry.issue %></span> | |||
|
15 | </p> | |||
13 | <p><%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p> |
|
16 | <p><%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p> | |
14 | <p><%= f.text_field :hours, :size => 6, :required => true %></p> |
|
17 | <p><%= f.text_field :hours, :size => 6, :required => true %></p> | |
15 | <p><%= f.text_field :comments, :size => 100 %></p> |
|
18 | <p><%= f.text_field :comments, :size => 100 %></p> | |
16 | <p><%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %></p> |
|
19 | <p><%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %></p> | |
17 | <% @time_entry.custom_field_values.each do |value| %> |
|
20 | <% @time_entry.custom_field_values.each do |value| %> | |
18 | <p><%= custom_field_tag_with_label :time_entry, value %></p> |
|
21 | <p><%= custom_field_tag_with_label :time_entry, value %></p> | |
19 | <% end %> |
|
22 | <% end %> | |
20 | <%= call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f }) %> |
|
23 | <%= call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f }) %> | |
21 | </div> |
|
24 | </div> | |
22 |
|
25 | |||
23 | <%= javascript_tag "observeAutocompleteField('time_entry_issue_id', '#{escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (@project ? nil : 'all'))}')" %> |
|
26 | <%= javascript_tag do %> | |
|
27 | observeAutocompleteField('time_entry_issue_id', '<%= escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (@project ? nil : 'all'))%>', { | |||
|
28 | select: function(event, ui) { | |||
|
29 | $('#time_entry_issue').text(ui.item.label); | |||
|
30 | } | |||
|
31 | }); | |||
|
32 | <% end %> |
General Comments 0
You need to be logged in to leave comments.
Login now