Feature #33256 » 0001-Show-wiki-toolbar-in-time-spent-form-for-custom-fiel.patch
| app/views/timelog/_form.html.erb | ||
|---|---|---|
| 31 | 31 |
<p><%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %></p> |
| 32 | 32 |
<% @time_entry.editable_custom_field_values.each do |value| %> |
| 33 | 33 |
<p><%= custom_field_tag_with_label :time_entry, value %></p> |
| 34 |
<% if value.custom_field.full_text_formatting? %> |
|
| 35 |
<%= wikitoolbar_for "time_entry_custom_field_values_#{value.custom_field_id}", preview_issue_path(:project_id => @project) %>
|
|
| 36 |
<% end %> |
|
| 34 | 37 |
<% end %> |
| 35 | 38 |
<%= call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f }) %>
|
| 36 | 39 |
</div> |
| app/views/timelog/bulk_edit.html.erb | ||
|---|---|---|
| 68 | 68 |
</p> |
| 69 | 69 | |
| 70 | 70 |
<% @custom_fields.each do |custom_field| %> |
| 71 |
<p><label><%= h(custom_field.name) %></label> <%= custom_field_tag_for_bulk_edit('time_entry', custom_field, @time_entries, @time_entry_params[:custom_field_values][custom_field.id.to_s]) %></p>
|
|
| 71 |
<p> |
|
| 72 |
<label><%= h(custom_field.name) %></label> |
|
| 73 |
<%= custom_field_tag_for_bulk_edit('time_entry', custom_field, @time_entries, @time_entry_params[:custom_field_values][custom_field.id.to_s]) %>
|
|
| 74 |
</p> |
|
| 75 |
<%= wikitoolbar_for "time_entry_custom_field_values_#{custom_field.id}", preview_issue_path(:project_id => @project) if custom_field.full_text_formatting? %>
|
|
| 72 | 76 |
<% end %> |
| 73 | 77 | |
| 74 | 78 |
<%= call_hook(:view_time_entries_bulk_edit_details_bottom, { :time_entries => @time_entries }) %>
|
