taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[backport] fix #3701 - fix html content in block text for the timeline

stable
Juanfran 2016-01-11 13:07:45 +01:00
parent 4e6f6f1254
commit b775939619
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/modules/user-timeline/user-timeline-item/user-timeline-item-type.service.coffee
View File

@ -88,7 +88,8 @@ timelineType = (timeline, event) ->
key: 'TIMELINE.NEW_COMMENT_US', key: 'TIMELINE.NEW_COMMENT_US',
translate_params: ['username', 'obj_name'], translate_params: ['username', 'obj_name'],
description: (timeline) -> description: (timeline) ->
return $(timeline.getIn(['data', 'comment_html'])).text() text = timeline.getIn(['data', 'comment_html'])
return $($.parseHTML(text)).text()
}, },
{ # NewIssueComment { # NewIssueComment
check: (timeline, event) -> check: (timeline, event) ->
@ -96,7 +97,8 @@ timelineType = (timeline, event) ->
key: 'TIMELINE.NEW_COMMENT_ISSUE', key: 'TIMELINE.NEW_COMMENT_ISSUE',
translate_params: ['username', 'obj_name'], translate_params: ['username', 'obj_name'],
description: (timeline) -> description: (timeline) ->
return $(timeline.getIn(['data', 'comment_html'])).text() text = timeline.getIn(['data', 'comment_html'])
return $($.parseHTML(text)).text()
}, },
{ # NewTaskComment { # NewTaskComment
check: (timeline, event) -> check: (timeline, event) ->
@ -104,7 +106,8 @@ timelineType = (timeline, event) ->
key: 'TIMELINE.NEW_COMMENT_TASK' key: 'TIMELINE.NEW_COMMENT_TASK'
translate_params: ['username', 'obj_name'], translate_params: ['username', 'obj_name'],
description: (timeline) -> description: (timeline) ->
return $(timeline.getIn(['data', 'comment_html'])).text() text = timeline.getIn(['data', 'comment_html'])
return $($.parseHTML(text)).text()
}, },
{ # UsMove { # UsMove
check: (timeline, event) -> check: (timeline, event) ->
@ -147,7 +150,8 @@ timelineType = (timeline, event) ->
translate_params: ['username', 'obj_name'], translate_params: ['username', 'obj_name'],
description: (timeline) -> description: (timeline) ->
if timeline.hasIn(['data', 'value_diff', 'value', 'blocked_note_html']) 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 else
return false return false
}, },