Nemcio/meanTorrent
1
0
Fork 0
mirror of https://github.com/taobataoma/meanTorrent.git synced 2026-01-24 08:09:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat(traces): add traces list filter

Browse Source
This commit is contained in:
OldHawk
2018-05-08 15:02:00 +08:00
parent a17f739de7
commit 802bbcf212
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
modules/traces/server/controllers/traces.server.controller.js
View File

@@ -6,6 +6,7 @@
var path = require('path'),
config = require(path.resolve('./config/config')),
mongoose = require('mongoose'),
objectId = require('mongodb').ObjectId,
errorHandler = require(path.resolve('./modules/core/server/controllers/errors.server.controller')),
User = mongoose.model('User'),
Trace = mongoose.model('Trace'),
@@ -35,16 +36,24 @@ exports.list = function (req, res) {
var keysS = req.query.keys + '';
var keysT = keysS.split(' ');
keysT.forEach(function (it) {
var ti = new RegExp(it, 'i');
keysA.push(ti);
});
if (keysT.length === 1 && mongoose.Types.ObjectId.isValid(keysT[0])) {
keysA = objectId(keysT[0]);
} else {
keysT.forEach(function (it) {
var ti = new RegExp(it, 'i');
keysA.push(ti);
});
}
}
if (keysA.length > 0) {
condition.$or = [
{'content.action': {'$all': keysA}}
];
if (mongoose.Types.ObjectId.isValid(keysA)) {
condition.user = keysA;
} else {
if (keysA.length > 0) {
condition.$or = [
{'content.action': {'$all': keysA}}
];
}
}
var countQuery = function (callback) {