summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2020-04-11 09:02:01 +0000
committerGo MAEDA <maeda@farend.jp>2020-04-11 09:02:01 +0000
commit92169b1124aad46755120af765f0f207a8612d25 (patch)
treed150e625c5fca887a6a28d423926d11132847454
parenta14697df687337f8df8316fc44e5f850ff425379 (diff)
downloadredmine-92169b1124aad46755120af765f0f207a8612d25.tar.gz
redmine-92169b1124aad46755120af765f0f207a8612d25.zip
Show toolbar for full width custom fields with text formatting enabled on issues bulk edit page (#32471).
Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@19691 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/helpers/custom_fields_helper.rb6
-rw-r--r--app/views/issues/bulk_edit.html.erb1
2 files changed, 6 insertions, 1 deletions
diff --git a/app/helpers/custom_fields_helper.rb b/app/helpers/custom_fields_helper.rb
index 229d5c11f..c66dae5fc 100644
--- a/app/helpers/custom_fields_helper.rb
+++ b/app/helpers/custom_fields_helper.rb
@@ -128,6 +128,10 @@ module CustomFieldsHelper
# Returns the custom field tag for when bulk editing objects
def custom_field_tag_for_bulk_edit(prefix, custom_field, objects=nil, value='')
+ css = custom_field.css_classes
+ if custom_field.full_text_formatting?
+ css += ' wiki-edit'
+ end
custom_field.format.bulk_edit_tag(
self,
custom_field_tag_id(prefix, custom_field),
@@ -135,7 +139,7 @@ module CustomFieldsHelper
custom_field,
objects,
value,
- :class => custom_field.css_classes)
+ :class => css)
end
# Returns custom field value tag
diff --git a/app/views/issues/bulk_edit.html.erb b/app/views/issues/bulk_edit.html.erb
index 663b80038..224ace22a 100644
--- a/app/views/issues/bulk_edit.html.erb
+++ b/app/views/issues/bulk_edit.html.erb
@@ -212,6 +212,7 @@
<label><%= custom_field.name %></label>
<%= custom_field_tag_for_bulk_edit('issue', custom_field, @issues, @issue_params[:custom_field_values][custom_field.id.to_s]) %>
</p>
+ <%= wikitoolbar_for "issue_custom_field_values_#{custom_field.id}", preview_issue_path(:project_id => @project, :issue_id => nil) if custom_field.full_text_formatting? %>
<% end %>
</fieldset>