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

Merge pull request #292 from taigaio/issue/2084-broken-activity-list 

Fix tg-2084: broken activity list
stable
Alejandro 2015-01-29 08:27:07 +01:00
parent 7fec877a51 9929182534
commit 2957fd2297
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/coffee/modules/common/history.coffee
View File

@ -181,11 +181,8 @@ HistoryDirective = ($log, $loading, $qqueue, $template, $confirm) ->
to = formatChange(value[1]) to = formatChange(value[1])
return templateChangeGeneric({name:name, from:from, to: to}) return templateChangeGeneric({name:name, from:from, to: to})
renderChangeEntries = (change, join=true) -> renderChangeEntries = (change) ->
entries = _.map(change.values_diff, (value, field) -> renderChangeEntry(field, value)) return _.map(change.values_diff, (value, field) -> renderChangeEntry(field, value))
if join
return entries.join("\n")
return entries
renderChangesHelperText = (change) -> renderChangesHelperText = (change) ->
size = countChanges(change) size = countChanges(change)
@ -209,7 +206,7 @@ HistoryDirective = ($log, $loading, $qqueue, $template, $confirm) ->
creationDate: moment(comment.created_at).format("DD MMM YYYY HH:mm") creationDate: moment(comment.created_at).format("DD MMM YYYY HH:mm")
comment: comment.comment_html comment: comment.comment_html
changesText: renderChangesHelperText(comment) changesText: renderChangesHelperText(comment)
changes: renderChangeEntries(comment, false) changes: renderChangeEntries(comment)
mode: "comment" mode: "comment"
deleteCommentDate: moment(comment.delete_comment_date).format("DD MMM YYYY HH:mm") if comment.delete_comment_date deleteCommentDate: moment(comment.delete_comment_date).format("DD MMM YYYY HH:mm") if comment.delete_comment_date
deleteCommentUser: comment.delete_comment_user.name if comment.delete_comment_user?.name deleteCommentUser: comment.delete_comment_user.name if comment.delete_comment_user?.name
@ -223,7 +220,7 @@ HistoryDirective = ($log, $loading, $qqueue, $template, $confirm) ->
userFullName: change.user.name userFullName: change.user.name
creationDate: moment(change.created_at).format("DD MMM YYYY HH:mm") creationDate: moment(change.created_at).format("DD MMM YYYY HH:mm")
comment: change.comment_html comment: change.comment_html
changes: renderChangeEntries(change, false) changes: renderChangeEntries(change)
changesText: "" changesText: ""
mode: "activity" mode: "activity"
deleteCommentDate: moment(change.delete_comment_date).format("DD MMM YYYY HH:mm") if change.delete_comment_date deleteCommentDate: moment(change.delete_comment_date).format("DD MMM YYYY HH:mm") if change.delete_comment_date

2
app/partials/common/history/history-activity.jade
View File

@ -31,5 +31,5 @@ div(class!="activity-single <%- mode %>")
<% } %> <% } %>
<% _.each(changes, function(change) { %> <% _.each(changes, function(change) { %>
| <%= change %> | <%= change %>
<% }) %> <% }) %>
<% } %> <% } %>