From 9e6e2573bc7d7f6014c0bbdaec837932d92564af Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Sat, 11 Apr 2020 10:09:50 +0000
Subject: [PATCH] Show wiki toolbar in time spent form for custom fields with
 text formatting enabled (#33256).

Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@19692 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/timelog/_form.html.erb     | 3 +++
 app/views/timelog/bulk_edit.html.erb | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/views/timelog/_form.html.erb b/app/views/timelog/_form.html.erb
index 24bce8b6d..3a0543e7c 100644
--- a/app/views/timelog/_form.html.erb
+++ b/app/views/timelog/_form.html.erb
@@ -31,6 +31,9 @@
   <p><%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %></p>
   <% @time_entry.editable_custom_field_values.each do |value| %>
     <p><%= custom_field_tag_with_label :time_entry, value %></p>
+    <% if value.custom_field.full_text_formatting? %>
+      <%= wikitoolbar_for "time_entry_custom_field_values_#{value.custom_field_id}", preview_issue_path(:project_id => @project) %>
+    <% end %>
   <% end %>
   <%= call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f }) %>
 </div>
diff --git a/app/views/timelog/bulk_edit.html.erb b/app/views/timelog/bulk_edit.html.erb
index bb7caa14b..3571b4016 100644
--- a/app/views/timelog/bulk_edit.html.erb
+++ b/app/views/timelog/bulk_edit.html.erb
@@ -68,7 +68,11 @@
     </p>
 
     <% @custom_fields.each do |custom_field| %>
-      <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>
+      <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>
+      <%= wikitoolbar_for "time_entry_custom_field_values_#{custom_field.id}", preview_issue_path(:project_id => @project) if custom_field.full_text_formatting? %>
     <% end %>
 
     <%= call_hook(:view_time_entries_bulk_edit_details_bottom, { :time_entries => @time_entries }) %>
-- 
2.39.5