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

6745-2404_testToMaster #1950

Merged
alexm merged 191 commits from 6745-2404_testToMaster into master 2024-01-25 07:39:13 +00:00
Conversation 0 Commits 191 Files Changed 177 +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'
}
}, options);
if (!deliveryState)
throw new UserError('The DELIVERED state does not exist');
await models.Ticket.state(ctx, {
ticketFk: ticketId,

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

@ -58,13 +58,10 @@ module.exports = Self => {
fields: ['stateFk']
}, myOptions);
const oldStateAllowed = ticketState ?
await models.State.isEditable(ctx, ticketState.stateFk, myOptions) :
false;
const oldStateAllowed = ticketState && await models.State.isEditable(ctx, ticketState.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');
await Self.rawSql(`CALL vn.ticket_setState(?, ?)`, [params.ticketFk, params.code], myOptions);