Project

General

Profile

Feature #29712 » feature-29712-v3.patch

Mizuki ISHIKAWA, 2018-10-15 06:21

View differences:

lib/redmine/field_format.rb
end
def edit_tag(view, tag_id, tag_name, custom_value, options={})
view.text_area_tag(tag_name, custom_value.value, options.merge(:id => tag_id, :rows => 8))
not_full_width_custom_fields = %w(IssueCustomField UserCustomField TimeEntryActivityCustomField)
# Display wikitoolbar only if textarea is full width
if custom_value.custom_field.text_formatting == 'full' &&
(not_full_width_custom_fields.exclude?(custom_value.custom_field.type) ||custom_value.custom_field.full_width_layout?)
if custom_value.custom_field.type == "IssueCustomField"
preview_url = view.preview_issue_url(:project_id => custom_value.customized.project.id, :issue_id => custom_value.customized.id)
else
preview_url = view.preview_text_url
end
view.content_tag('span', :id => "#{tag_id}_and_toolbar") do
view.text_area_tag(tag_name, custom_value.value,
options.merge(:id => tag_id,
:rows => 8,
:class => 'wiki-edit'
))
end + view.wikitoolbar_for(tag_id, preview_url)
else
view.text_area_tag(tag_name, custom_value.value, options.merge(:id => tag_id, :rows => 8))
end
end
def bulk_edit_tag(view, tag_id, tag_name, custom_field, objects, value, options={})
test/unit/lib/redmine/field_format/field_format_test.rb
assert_equal "foo bar", field.format.formatted_custom_value(self, custom_value, false)
assert_equal '<a class="external" href="http://foo/foo%20bar#anchor">foo bar</a>', field.format.formatted_custom_value(self, custom_value, true)
end
def test_edit_tag_should_display_wikitoolbar_if_text_formatting_enabled
field = ProjectCustomField.new(:field_format => 'text', :text_formatting => 'full')
custom_value = CustomValue.new(:custom_field => field, :customized => Project.first, :value => "foo bar")
edit_tag = field.format.edit_tag(self, "tag_id", "tag_name", custom_value)
assert_includes edit_tag, "<textarea name=\"tag_name\" id=\"tag_id\" rows=\"8\" class=\"wiki-edit\">\nfoo bar</textarea>"
assert_includes edit_tag, wikitoolbar_for('tag_id', preview_text_url)
end
def test_edit_tag_should_not_display_wikitoolbar_if_text_formatting_disabled
field = ProjectCustomField.new(:field_format => 'text', :text_formatting => nil)
custom_value = CustomValue.new(:custom_field => field, :customized => Project.first, :value => "foo bar")
edit_tag = field.format.edit_tag(self, "tag_id", "tag_name", custom_value)
assert_includes edit_tag, "<textarea name=\"tag_name\" id=\"tag_id\" rows=\"8\">\nfoo bar</textarea>"
assert_not_includes edit_tag, wikitoolbar_for('tag_id', preview_text_url)
end
def test_edit_tag_should_not_display_wikitoolbar_if_the_field_is_not_full_width_layout
field = IssueCustomField.new(:field_format => 'text', :full_width_layout => nil, :text_formatting => 'full')
custom_value = CustomValue.new(:custom_field => field, :customized => Issue.first, :value => "foo bar")
edit_tag = field.format.edit_tag(self, "tag_id", "tag_name", custom_value)
assert_includes edit_tag, "<textarea name=\"tag_name\" id=\"tag_id\" rows=\"8\">\nfoo bar</textarea>"
assert_not_includes edit_tag, wikitoolbar_for('tag_id', preview_text_url)
end
def test_edit_tag_should_display_wikitoolbar_if_the_field_is_full_width_layout
field = IssueCustomField.new(:field_format => 'text', :full_width_layout => '1', :text_formatting => 'full')
custom_value = CustomValue.new(:custom_field => field, :customized => Issue.first, :value => "foo bar")
edit_tag = field.format.edit_tag(self, "tag_id", "tag_name", custom_value)
assert_includes edit_tag, "<textarea name=\"tag_name\" id=\"tag_id\" rows=\"8\" class=\"wiki-edit\">\nfoo bar</textarea>"
assert_includes edit_tag, wikitoolbar_for('tag_id', preview_issue_url(:project_id => Issue.first.project.id, :issue_id => Issue.first.id))
end
end
(3-3/5)