From d55318bda43465700a9b16b2afa217bd2421db37 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Mon, 11 Jan 2016 13:07:45 +0100 Subject: [PATCH] fix #3701 - fix html content in block text for the timeline --- .../user-timeline-item-type.service.coffee | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/modules/user-timeline/user-timeline-item/user-timeline-item-type.service.coffee b/app/modules/user-timeline/user-timeline-item/user-timeline-item-type.service.coffee index e5c36811..d221977b 100644 --- a/app/modules/user-timeline/user-timeline-item/user-timeline-item-type.service.coffee +++ b/app/modules/user-timeline/user-timeline-item/user-timeline-item-type.service.coffee @@ -88,7 +88,8 @@ timelineType = (timeline, event) -> key: 'TIMELINE.NEW_COMMENT_US', translate_params: ['username', 'obj_name'], description: (timeline) -> - return $(timeline.getIn(['data', 'comment_html'])).text() + text = timeline.getIn(['data', 'comment_html']) + return $($.parseHTML(text)).text() }, { # NewIssueComment check: (timeline, event) -> @@ -96,7 +97,8 @@ timelineType = (timeline, event) -> key: 'TIMELINE.NEW_COMMENT_ISSUE', translate_params: ['username', 'obj_name'], description: (timeline) -> - return $(timeline.getIn(['data', 'comment_html'])).text() + text = timeline.getIn(['data', 'comment_html']) + return $($.parseHTML(text)).text() }, { # NewTaskComment check: (timeline, event) -> @@ -104,7 +106,8 @@ timelineType = (timeline, event) -> key: 'TIMELINE.NEW_COMMENT_TASK' translate_params: ['username', 'obj_name'], description: (timeline) -> - return $(timeline.getIn(['data', 'comment_html'])).text() + text = timeline.getIn(['data', 'comment_html']) + return $($.parseHTML(text)).text() }, { # UsMove check: (timeline, event) -> @@ -147,7 +150,8 @@ timelineType = (timeline, event) -> translate_params: ['username', 'obj_name'], description: (timeline) -> if timeline.hasIn(['data', 'value_diff', 'value', 'blocked_note_html']) - return $(timeline.getIn(['data', 'value_diff', 'value', 'blocked_note_html']).get(1)).text() + text = timeline.getIn(['data', 'value_diff', 'value', 'blocked_note_html']).get(1) + return $($.parseHTML(text)).text() else return false },