Skip to content

GitLab

S
scratch-www
Commit 426259fb authored by Matthew Taylor's avatar Matthew Taylor Committed by GitHub
Browse files
Options

Merge pull request #1542 from mewtaylor/issue/manager-thumbnail-activity 

[Develop] Hotfix: use recipient thumbnail, not actor for manager activity
parents 16a52086 d4b0207b
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/components/activity/activity.jsx
View file @ 426259fb
......@@ -36,11 +36,11 @@ var Activity = React.createClass({
<ul key="activity-ul">
{this.props.items.map(function (item) {
if (item.message.replace(/\s/g, '')) {
var username = '';
var username = item.actor.username;
var thumbnailUrl = item.actor.thumbnail_url;
if (item.type === 22) {
username = item.recipient_username;
} else {
username = item.actor.username;
thumbnailUrl = item.recipient.thumbnail_url;
}
var actorProfileUrl = '/users/' + username + '/';
var activityMessageHTML = (
......@@ -51,7 +51,7 @@ var Activity = React.createClass({
return (
<li key={item.pk}>
<a href={actorProfileUrl}>
<img src={item.actor.thumbnail_url} width="34" height="34" alt="" />
<img src={thumbnailUrl} width="34" height="34" alt="" />
<p dangerouslySetInnerHTML={{__html: activityMessageHTML}}></p>
<p>
<span className="stamp">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment