verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 66 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 -2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b4b3dc58c0 - Show all commits

5
modules/route/back/methods/route/filter.js
View File

@ -110,10 +110,11 @@ module.exports = Self => {
}
});
console.log('ctx', userId);
filter = mergeFilters(filter, {where});
const worker = await models.Worker.findById(userId, {fields: ['isFreelance']});
const getRouteByAgency = await models.ACL.checkAccessAcl(ctx, 'Route', 'getRouteByAgency', 'WRITE');
if (userId && getRouteByAgency) {
if (userId && getRouteByAgency && worker.isFreelance) {
if (!filter.where) filter.where = {};
filter.where[`workerFk`] = userId;
}