Skip to content

Commit b123b72

Browse files
committed
no unread messages for non members
1 parent 122e5c5 commit b123b72

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/projects/detail/containers/FeedContainer.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class FeedView extends React.Component {
117117
}
118118

119119
mapFeed(feed, showAll = false, resetNewComment = false, prevProps) {
120-
const { allMembers, project } = this.props
120+
const { allMembers, project, currentMemberRole } = this.props
121121
const item = _.pick(feed, ['id', 'date', 'read', 'tag', 'title', 'totalPosts', 'userId', 'reference', 'referenceId', 'postIds', 'isSavingTopic', 'isDeletingTopic', 'isAddingComment', 'isLoadingComments', 'error'])
122122
// Github issue##623, allow comments on all posts (including system posts)
123123
item.allowComments = true
@@ -126,7 +126,7 @@ class FeedView extends React.Component {
126126
} else {
127127
item.user = allMembers[item.userId]
128128
}
129-
item.unread = !feed.read
129+
item.unread = !feed.read && !!currentMemberRole
130130
// skip over the first post since that is the topic post
131131
item.totalComments = feed.totalPosts-1
132132
item.comments = []
@@ -145,7 +145,7 @@ class FeedView extends React.Component {
145145
isSavingComment: p.isSavingComment,
146146
isDeletingComment: p.isDeletingComment,
147147
error: p.error,
148-
unread: !p.read,
148+
unread: !p.read && !!currentMemberRole,
149149
date,
150150
edited,
151151
author: isSystemUser(p.userId) ? SYSTEM_USER : allMembers[p.userId]

0 commit comments

Comments
 (0)