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

Merge branch 'master' into subscribe-mod-actions

Browse Source 
Conflicts:
	client/coral-admin/src/routes/Moderation/components/Moderation.js
	client/coral-admin/src/routes/Moderation/components/styles.css
	client/coral-admin/src/routes/Moderation/containers/Moderation.js
This commit is contained in:
Chi Vinh Le
2017-06-19 23:52:10 +07:00
parent 2a28306ab2 332679a7bc
commit fbbd0fa027
24 changed files with 522 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graph/resolvers/root_query.js
+2 -2
View File
@@ -6,12 +6,12 @@ const {
} = require('../../perms/constants');
const RootQuery = {
assets(_, args, {loaders: {Assets}, user}) {
assets(_, {query}, {loaders: {Assets}, user}) {
if (user == null || !user.can(SEARCH_ASSETS)) {
return null;
}
return Assets.getAll.load();
return Assets.search(query);
},
asset(_, query, {loaders: {Assets}}) {
if (query.id) {