wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-28 11:27:05 +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
services/assets.js
+3 -4
View File
@@ -104,13 +104,12 @@ module.exports = class AssetsService {
}
/**
* Finds assets matching keywords on the model. If `value` is an empty string,
* then it will not even perform a text search query.
* Finds assets matching keywords on the model.
* @param {String} value string to search by.
* @return {Promise}
*/
static search(value = '', skip = null, limit = null) {
if (value.length === 0) {
static search({value, skip, limit} = {}) {
if (!value) {
return AssetsService.all(skip, limit);
} else {
return AssetModel