scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 07:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #2871 from benjiwheeler/pass-ownerusername-to-comment-replies-endpoint

Browse source 
pass ownerUsername in three places it was left out
This commit is contained in:
Benjamin Wheeler 2019-04-02 18:39:51 -04:00 committed by GitHub
commit afe6d6f4a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/redux/preview.js
View file

@ -481,7 +481,7 @@ module.exports.getTopLevelComments = (id, offset, ownerUsername, isAdmin, token)
} }
dispatch(module.exports.setFetchStatus('comments', module.exports.Status.FETCHED)); dispatch(module.exports.setFetchStatus('comments', module.exports.Status.FETCHED));
dispatch(module.exports.setComments(body)); dispatch(module.exports.setComments(body));
dispatch(module.exports.getReplies(id, body.map(comment => comment.id), 0, isAdmin, token)); dispatch(module.exports.getReplies(id, body.map(comment => comment.id), 0, ownerUsername, isAdmin, token));
// If we loaded a full page of comments, assume there are more to load. // If we loaded a full page of comments, assume there are more to load.
// This will be wrong (1 / COMMENT_LIMIT) of the time, but does not require // This will be wrong (1 / COMMENT_LIMIT) of the time, but does not require
@ -511,13 +511,13 @@ module.exports.getCommentById = (projectId, commentId, ownerUsername, isAdmin, t
if (body.parent_id) { if (body.parent_id) {
// If the comment is a reply, load the parent // If the comment is a reply, load the parent
return dispatch(module.exports.getCommentById(projectId, body.parent_id, isAdmin, token)); return dispatch(module.exports.getCommentById(projectId, body.parent_id, ownerUsername, isAdmin, token));
} }
// If the comment is not a reply, show it as top level and load replies // If the comment is not a reply, show it as top level and load replies
dispatch(module.exports.setFetchStatus('comments', module.exports.Status.FETCHED)); dispatch(module.exports.setFetchStatus('comments', module.exports.Status.FETCHED));
dispatch(module.exports.setComments([body])); dispatch(module.exports.setComments([body]));
dispatch(module.exports.getReplies(projectId, [body.id], 0, isAdmin, token)); dispatch(module.exports.getReplies(projectId, [body.id], 0, ownerUsername, isAdmin, token));
}); });
}); });