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

fix: refs #7917 fix methods, tests, acls #3085

Closed
carlossa wants to merge 35 commits from 7917-freelancerRoute into dev
pull from: 7917-freelancerRoute
merge into: verdnatura:dev
Conversation 1 Commits 35 Files Changed 9 +3 -1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c59a68ae1f - Show all commits

4
modules/entry/back/methods/entry/filter.js
View File

@ -173,7 +173,9 @@ module.exports = Self => {
}
});
filter = mergeFilters(ctx.args.filter, {where});
const supplier = await Self.app.models.Supplier.isSupplier(ctx.req.accessToken.userId);
const userId = ctx.req.accessToken.userId;
const client = await Self.app.models.Client.findById(userId, myOptions);
const supplier = await Self.app.models.Supplier.findOne({where: {nif: client.fi}}, myOptions);
if (supplier) {
if (!filter.where) filter.where = {};
filter.where[`e.supplierFk`] = supplier.id;