verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

Merge pull request 'Handle ticket without old state' (#384) from 2472-ticket_tracking_fix into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #384
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
This commit is contained in:
Bernat Exposito 2020-09-22 06:37:49 +00:00
parent 7464609157 89667a18c9
commit 97fb4c5b31
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/ticket/back/methods/ticket-tracking/changeState.js
View File

@ -40,15 +40,17 @@ module.exports = Self => {
params.workerFk = worker.id;
}
let ticket = await models.TicketState.findById(
let ticketState = await models.TicketState.findById(
params.ticketFk,
{fields: ['stateFk']}
);
let oldStateAllowed = await models.State.isEditable(ctx, ticket.stateFk);
let oldStateAllowed;
if (ticketState)
oldStateAllowed = await models.State.isEditable(ctx, ticketState.stateFk);
let newStateAllowed = await models.State.isEditable(ctx, params.stateFk);
let isAllowed = oldStateAllowed && newStateAllowed;
let isAllowed = (!ticketState || oldStateAllowed == true) && newStateAllowed == true;
if (!isAllowed)
throw new UserError(`You don't have enough privileges`, 'ACCESS_DENIED');

2
package-lock.json generated
View File

@ -22928,7 +22928,7 @@
},
"sha.js": {
"version": "2.4.11",
"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
"resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
"integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
"dev": true,
"requires": {