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

On history, use de default avatar for not-existing-users and using the name from the history

stable
Jesús Espino 2014-10-17 12:56:48 +02:00
parent 89af22dbe5
commit 3e430e36ce
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -282,7 +282,10 @@ HistoryDirective = ($log, $loading) ->
return $scope.usersById[userId]?.full_name_display return $scope.usersById[userId]?.full_name_display
getUserAvatar = (userId) -> getUserAvatar = (userId) ->
return $scope.usersById[userId]?.photo if $scope.usersById[userId]?
return $scope.usersById[userId].photo
else
return "/images/unnamed.png"
countChanges = (comment) -> countChanges = (comment) ->
return _.keys(comment.values_diff).length return _.keys(comment.values_diff).length
@ -373,7 +376,7 @@ HistoryDirective = ($log, $loading) ->
return templateActivity({ return templateActivity({
avatar: getUserAvatar(comment.user.pk) avatar: getUserAvatar(comment.user.pk)
userFullName: getUserFullName(comment.user.pk) userFullName: comment.user.name
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)
@ -388,7 +391,7 @@ HistoryDirective = ($log, $loading) ->
renderChange = (change) -> renderChange = (change) ->
return templateActivity({ return templateActivity({
avatar: getUserAvatar(change.user.pk) avatar: getUserAvatar(change.user.pk)
userFullName: getUserFullName(change.user.pk) 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, false)