wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-15 12:55:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:coralproject/talk into username-ban

Browse Source
This commit is contained in:
David Jay
2017-02-02 12:29:29 -05:00
parent 97c3ebc3e0 ce002e366d
commit feb0860ba1
42 changed files with 8560 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graph/loaders/comments.js
+5 -1
View File
@@ -73,7 +73,7 @@ const getCountsByParentID = (context, parent_ids) => {
* @param {Object} context graph context
* @param {Object} query query terms to apply to the comments query
*/
const getCommentsByQuery = ({user}, {ids, statuses, asset_id, parent_id, limit, cursor, sort}) => {
const getCommentsByQuery = ({user}, {ids, statuses, asset_id, parent_id, author_id, limit, cursor, sort}) => {
let comments = CommentModel.find();
// Only administrators can search for comments with statuses that are not
@@ -100,6 +100,10 @@ const getCommentsByQuery = ({user}, {ids, statuses, asset_id, parent_id, limit,
});
}
if (user && (user.hasRoles('ADMIN') || user.id === author_id)) {
comments = comments.where({author_id});
}
if (asset_id) {
comments = comments.where({asset_id});
}