Skip to content

Github issue #572, Messaging: Owner response post missing from status update #586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vikasrohit merged 2 commits into from
Dec 14, 2016
Merged

Github issue #572, Messaging: Owner response post missing from status update #586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd08081
Github issue #572, Messaging: Owner response post missing from status…
Dec 14, 2016
4114f3a
Github issue #572, Messaging: Owner response post missing from status…
Dec 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/Feed/Feed.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ const Feed = (props) => {
<div className="card-body draftjs-post" dangerouslySetInnerHTML={{__html: html}} />
</div>
</Panel.Body>
{allowComments &&
<FeedComments
allowComments={ allowComments }
totalComments={totalComments}
hasMoreComments={hasMoreComments}
onLoadMoreComments={onLoadMoreComments}
Expand All @@ -49,7 +49,7 @@ const Feed = (props) => {
avatarUrl={currentUser.photoURL}
comments={comments}
isAddingComment={ isAddingComment }
/>}
/>
{children}
</ActionCard>
)
Expand Down
5 changes: 3 additions & 2 deletions src/components/Feed/FeedComments.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class FeedComments extends React.Component {
render() {
const {
comments, currentUser, totalComments, onLoadMoreComments, isLoadingComments, hasMoreComments, onAdd,
onChange, content, avatarUrl, isAddingComment
onChange, content, avatarUrl, isAddingComment, allowComments
} = this.props
let authorName = currentUser.firstName
if (authorName && currentUser.lastName) {
Expand Down Expand Up @@ -77,6 +77,7 @@ class FeedComments extends React.Component {
<div dangerouslySetInnerHTML={{__html: item.content}} />
</Comment>
)}
{allowComments &&
<AddComment
placeholder="Create a new comment..."
onAdd={onAdd}
Expand All @@ -85,7 +86,7 @@ class FeedComments extends React.Component {
avatarUrl={avatarUrl}
authorName={ authorName }
isAdding={ isAddingComment }
/>
/>}
</div>
)
}
Expand Down