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 -17
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e7c3fa1079 - Show all commits

20
modules/route/back/methods/agency-term/filter.js
View File

@ -36,13 +36,7 @@ module.exports = Self => {
arg: 'to', arg: 'to',
type: 'date', type: 'date',
description: 'The to date filter', description: 'The to date filter',
}, }
{
arg: 'userId',
type: 'integer',
description: 'The user id',
required: true,
},
], ],
returns: { returns: {
type: ['object'], type: ['object'],
@ -55,8 +49,6 @@ module.exports = Self => {
}); });
Self.filter = async(ctx, filter, options) => { Self.filter = async(ctx, filter, options) => {
const models = Self.app.models;
const userId = ctx.req.accessToken.userId;
const conn = Self.dataSource.connector; const conn = Self.dataSource.connector;
const myOptions = {}; const myOptions = {};
@ -80,14 +72,7 @@ module.exports = Self => {
} }
}); });
filter = mergeFilters(ctx.args?.filter ?? {}, {where}); filter = mergeFilters(filter, {where});
const getRouteByAgency = await models.ACL.checkAccessAcl(ctx, 'Route', 'getRouteByAgency', 'WRITE');
const supplier = await models.Supplier.isSupplier(userId, myOptions);
if (supplier && getRouteByAgency) {
if (!filter.where) filter.where = {};
filter.where[`a.supplierFk`] = supplier.id;
}
const date = Date.vnNew(); const date = Date.vnNew();
carlossa marked this conversation as resolved Outdated
jgallego commented 2024-11-27 10:59:01 +00:00
Outdated
Review
Copy Link

crear acl getRouteByAgency, comprobar los acl de mas a menos permisivo.

esta part de la tarea no la veig implementada

`crear acl getRouteByAgency, comprobar los acl de mas a menos permisivo.` esta part de la tarea no la veig implementada
date.setHours(0, 0, 0, 0); date.setHours(0, 0, 0, 0);
@ -130,6 +115,7 @@ module.exports = Self => {
const sql = ParameterizedSQL.join(stmts, ';'); const sql = ParameterizedSQL.join(stmts, ';');
const result = await conn.executeStmt(sql, myOptions); const result = await conn.executeStmt(sql, myOptions);
const models = Self.app.models;
for (let agencyTerm of result) for (let agencyTerm of result)
agencyTerm.route = await models.Route.findById(agencyTerm.routeFk); agencyTerm.route = await models.Route.findById(agencyTerm.routeFk);