verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 65 Releases Wiki Activity

7525-devToTest #2542

Merged
alexm merged 231 commits from 7525-devToTest into test 2024-06-04 07:59:34 +00:00
Conversation 0 Commits 231 Files Changed 103 +3 -4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 39dcb7d6a8 - Show all commits

7
modules/ticket/back/methods/ticket/isEditableOrThrow.js
View File

@ -27,17 +27,16 @@ module.exports = Self => {
const ticketCollection = await models.TicketCollection.findOne({ const ticketCollection = await models.TicketCollection.findOne({
include: {relation: 'collection'}, where: {ticketFk: id} include: {relation: 'collection'}, where: {ticketFk: id}
}, myOptions); }, myOptions);
let workerId = ticketCollection?.collection()?.workerFk; let isOwner = ticketCollection?.collection()?.workerFk === ctx.req.accessToken.userId;
if (!workerId) { if (!isOwner) {
const saleGroup = await models.SaleGroup.findOne({fields: ['id'], where: {ticketFk: id}}, myOptions); const saleGroup = await models.SaleGroup.findOne({fields: ['id'], where: {ticketFk: id}}, myOptions);
const sectorCollectionSaleGroup = saleGroup && await models.SectorCollectionSaleGroup.findOne({ const sectorCollectionSaleGroup = saleGroup && await models.SectorCollectionSaleGroup.findOne({
include: {relation: 'sectorCollection'}, where: {saleGroupFk: saleGroup.id} include: {relation: 'sectorCollection'}, where: {saleGroupFk: saleGroup.id}
}, myOptions); }, myOptions);
workerId = sectorCollectionSaleGroup?.sectorCollection()?.userFk; isOwner = sectorCollectionSaleGroup?.sectorCollection()?.userFk === ctx.req.accessToken.userId;
} }
const isOwner = workerId === ctx.req.accessToken.userId;
if (!ticket) if (!ticket)
throw new ForbiddenError(`The ticket doesn't exist.`); throw new ForbiddenError(`The ticket doesn't exist.`);