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

refactor(ticketTracking.create): refs #6366 unify Ticket.state ticketTracking.create i vn.ticket_setState #1838

Merged
pablone merged 11 commits from 6366-unifyTicketChangeState into dev 2024-01-09 07:00:19 +00:00
Conversation 0 Commits 11 Files Changed 6 +2 -7
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e9773b3885 - Show all commits

2
modules/ticket/back/methods/ticket/saveSign.js
View File

@ -136,8 +136,6 @@ module.exports = Self => {
code: 'DELIVERED' code: 'DELIVERED'
} }
}, options); }, options);
if (!deliveryState)
throw new UserError('The DELIVERED state does not exist');
pablone marked this conversation as resolved
alexm commented 2024-01-02 06:42:40 +00:00
Review
Copy Link

Este if no el acabe de vore.

Este if no el acabe de vore.
await models.Ticket.state(ctx, { await models.Ticket.state(ctx, {
ticketFk: ticketId, ticketFk: ticketId,

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

@ -58,13 +58,10 @@ module.exports = Self => {
fields: ['stateFk'] fields: ['stateFk']
}, myOptions); }, myOptions);
const oldStateAllowed = ticketState ? const oldStateAllowed = ticketState && await models.State.isEditable(ctx, ticketState.stateFk, myOptions);
pablone marked this conversation as resolved Outdated
alexm commented 2024-01-02 06:51:31 +00:00
Outdated
Review
Copy Link

const oldStateAllowed = ticketState && await models.State.isEditable(ctx, ticketState.stateFk, myOptions);

const oldStateAllowed = ticketState && await models.State.isEditable(ctx, ticketState.stateFk, myOptions);
await models.State.isEditable(ctx, ticketState.stateFk, myOptions) :
false;
const newStateAllowed = await models.State.isEditable(ctx, params.stateFk, myOptions); const newStateAllowed = await models.State.isEditable(ctx, params.stateFk, myOptions);
if (!((!ticketState || oldStateAllowed == true) && newStateAllowed == true)) if ((ticketState && !oldStateAllowed) || !newStateAllowed)
throw new UserError(`You don't have enough privileges`, 'ACCESS_DENIED'); throw new UserError(`You don't have enough privileges`, 'ACCESS_DENIED');
await Self.rawSql(`CALL vn.ticket_setState(?, ?)`, [params.ticketFk, params.code], myOptions); await Self.rawSql(`CALL vn.ticket_setState(?, ?)`, [params.ticketFk, params.code], myOptions);
pablone marked this conversation as resolved
alexm commented 2024-01-02 07:02:55 +00:00
Review
Copy Link

Crec que queda mes simple com:
if ((ticketState && !oldStateAllowed) || !newStateAllowed)

Crec que queda mes simple com: if ((ticketState && !oldStateAllowed) || !newStateAllowed)