Merge branch 'master' into sory-139595043-qbox

This commit is contained in:
gaba
2017-02-14 08:51:58 -08:00
57 changed files with 1179 additions and 663 deletions
+7 -1
View File
@@ -154,7 +154,9 @@ const USER_GRAPH_OPERATIONS = [
'mutation:createComment',
'mutation:createAction',
'mutation:deleteAction',
'mutation:editName'
'mutation:editName',
'mutation:setUserStatus',
'mutation:setCommentStatus'
];
/**
@@ -170,6 +172,10 @@ UserSchema.method('can', function(...actions) {
return false;
}
if (actions.some((action) => action === 'mutation:setUserStatus' || action === 'mutation:setCommentStatus') && !this.hasRoles('ADMIN')) {
return false;
}
return true;
});