verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 70 Releases Wiki Activity

232201_test_to_master #1582

Merged
alexm merged 126 commits from 232201_test_to_master into master 2023-06-01 06:16:49 +00:00
Conversation 0 Commits 126 Files Changed 56 +4 -8
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 463d209d77 - Show all commits

12
modules/ticket/back/methods/state/editableStates.js
View File

@ -20,21 +20,17 @@ module.exports = Self => {
Self.editableStates = async(ctx, filter, options) => {
const models = Self.app.models;
const userId = ctx.req.accessToken.userId;
const myOptions = {...(options || {})};
const isProduction = await models.VnUser.hasRole(userId, 'production', myOptions);
const isSalesPerson = await models.VnUser.hasRole(userId, 'salesPerson', myOptions);
const isAdministrative = await models.VnUser.hasRole(userId, 'administrative', myOptions);
let where = {alertLevel: 0};
if (isSalesPerson)
where = {or: [{alertLevel: 0}, {code: 'PICKER_DESIGNED'}]};
else if (isProduction || isAdministrative)
where = undefined;
const where = (isProduction || isAdministrative) ? undefined : {alertLevel: 0};
filter = mergeFilters(filter, {where});
return models.State.find(filter, myOptions);
const states = await models.State.find(filter, myOptions);
return states;
};
};