meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-02-01 03:57:15 +00:00
Code Issues Releases Wiki Activity

Refactor custom field value tag for custom fields with full text formatting enabled (#29712).

Browse Source 
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@17859 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2019-02-12 11:52:20 +00:00
parent b6592a73e8
commit 82b707109f
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/helpers/custom_fields_helper.rb
View File

@ -129,6 +129,17 @@ module CustomFieldsHelper
:class => "#{custom_field.field_format}_cf"
end
# Returns custom field value tag
def custom_field_value_tag(value)
attr_value = show_value(value)
if !attr_value.blank? && value.custom_field.full_text_formatting?
content_tag('div', attr_value, :class => 'wiki')
else
attr_value
end
end
# Return a string used to display a custom value
def show_value(custom_value, html=true)
format_object(custom_value, html)

16
app/helpers/issues_helper.rb
View File

@ -244,12 +244,8 @@ module IssuesHelper
issue_fields_rows do |rows|
values.each_with_index do |value, i|
css = "cf_#{value.custom_field.id}"
attr_value = show_value(value)
if value.custom_field.text_formatting == 'full'
attr_value = content_tag('div', attr_value, class: 'wiki')
end
m = (i < half ? :left : :right)
rows.send m, custom_field_name_tag(value.custom_field), attr_value, :class => css
rows.send m, custom_field_name_tag(value.custom_field), custom_field_value_tag(value), :class => css
end
end
end
@ -260,17 +256,13 @@ module IssuesHelper
s = ''.html_safe
values.each_with_index do |value, i|
attr_value = show_value(value)
next if attr_value.blank?
if value.custom_field.text_formatting == 'full'
attr_value = content_tag('div', attr_value, class: 'wiki')
end
attr_value_tag = custom_field_value_tag(value)
next if attr_value_tag.blank?
content =
content_tag('hr') +
content_tag('p', content_tag('strong', custom_field_name_tag(value.custom_field) )) +
content_tag('div', attr_value, class: 'value')
content_tag('div', attr_value_tag, class: 'value')
s << content_tag('div', content, class: "cf_#{value.custom_field.id} attribute")
end
s