Merge pull request #650 from mlorb/ml_sci_1286

Fix bug with titles truncate in activities [SCI-1286]
This commit is contained in:
mlorb 2017-06-05 16:27:44 +02:00 committed by GitHub
commit 3dc83cfe05

View file

@ -1,13 +1,20 @@
module ActivityHelper module ActivityHelper
def activity_truncate(message, len = Constants::NAME_TRUNCATION_LENGTH) def activity_truncate(message, len = Constants::NAME_TRUNCATION_LENGTH)
activity_title = message.match(/<strong>(.*?)<\/strong>/)[1] activity_titles = message.scan(/<strong>(.*?)<\/strong>/)
if activity_title.length > Constants::NAME_TRUNCATION_LENGTH activity_titles.each do |activity_title|
title = "<div class='modal-tooltip'>#{truncate(activity_title, length: len)} activity_title = activity_title[0]
<span class='modal-tooltiptext'>#{activity_title}</span></div>" if activity_title.length > Constants::NAME_TRUNCATION_LENGTH
else title = "<div class='modal-tooltip'>
title = truncate(activity_title, length: len) #{truncate(activity_title, length: len)}
<span class='modal-tooltiptext'>
#{activity_title}
</span>
</div>"
else
title = truncate(activity_title, length: len)
end
message = message.gsub(/#{Regexp.escape(activity_title)}/, title)
end end
message = message.gsub(/#{activity_title}/, title )
sanitize_input(message) if message sanitize_input(message) if message
end end