verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 63 Releases Wiki Activity

removed eslint errors

This commit is contained in:
Daniel Herrero 2017-11-09 08:59:40 +01:00
parent d2491bfbf4
commit 3d33c21cc8
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
services/loopback/common/models/vn-model.js
View File

@ -45,18 +45,20 @@ module.exports = function(Self) {
}); });
this.list = function(ctx, clientFilter, cb) { this.list = function(ctx, clientFilter, cb) {
var clientFields = (clientFilter && clientFilter.fields) ? clientFilter.fields : []; let clientFields = (clientFilter && clientFilter.fields) ? clientFilter.fields : [];
var serverFields = (serverFilter && serverFilter.fields) ? serverFilter.fields : []; let serverFields = (serverFilter && serverFilter.fields) ? serverFilter.fields : [];
var fields = clientFields.filter(itemC => { let fields = clientFields.filter(itemC => {
return serverFields.some(itemS => itemS === itemC); return serverFields.some(itemS => itemS === itemC);
}); });
let and = [];
let order;
let limit;
let filter = {order: order, limit: limit};
var and = []; if (clientFilter && clientFilter.where)
(clientFilter && clientFilter.where) && and.push(clientFilter.where); and.push(clientFilter.where);
(serverFilter && serverFilter.where) && and.push(serverFilter.where); if (serverFilter && serverFilter.where)
and.push(serverFilter.where);
var order;
var limit;
if (clientFilter && clientFilter.order) if (clientFilter && clientFilter.order)
order = clientFilter.order; order = clientFilter.order;
@ -68,12 +70,14 @@ module.exports = function(Self) {
else if (clientFilter && clientFilter.limit) else if (clientFilter && clientFilter.limit)
limit = clientFilter.limit; limit = clientFilter.limit;
var filter = {order: order, limit: limit};
filter.where = (and.length > 0) && {and: and}; filter.where = (and.length > 0) && {and: and};
filter.fields = fields; filter.fields = fields;
this.find(filter, function(err, states) { this.find(filter, function(err, states) {
(err) ? cb(err, null) : cb(null, states); if (err)
cb(err, null);
else
cb(null, states);
}); });
}; };
}; };
@ -198,8 +202,8 @@ function removeEmpty(o) {
let array = []; let array = [];
for (let item of o) { for (let item of o) {
let i = removeEmpty(item); let i = removeEmpty(item);
if (!isEmpty(item)) if (!isEmpty(i))
array.push(item); array.push(i);
} }
if (array.length > 0) if (array.length > 0)
return array; return array;