verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 63 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 +7 -7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9263684ec5 - Show all commits

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

@ -1,3 +1,4 @@
const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
module.exports = Self => { module.exports = Self => {
Self.remoteMethodCtx('editableStates', { Self.remoteMethodCtx('editableStates', {
description: 'Gets the editable states according the user role ', description: 'Gets the editable states according the user role ',
@ -19,21 +20,20 @@ module.exports = Self => {
Self.editableStates = async(ctx, filter, options) => { Self.editableStates = async(ctx, filter, options) => {
const models = Self.app.models; const models = Self.app.models;
const userId = ctx.req.accessToken.userId; const userId = ctx.req.accessToken.userId;
const myOptions = {};
if (typeof options == 'object') const myOptions = {...(options || {})};
Object.assign(myOptions, options);
const isProduction = await models.VnUser.hasRole(userId, 'production', myOptions); const isProduction = await models.VnUser.hasRole(userId, 'production', myOptions);
const isSalesPerson = await models.VnUser.hasRole(userId, 'salesPerson', myOptions); const isSalesPerson = await models.VnUser.hasRole(userId, 'salesPerson', myOptions);
const isAdministrative = await models.VnUser.hasRole(userId, 'administrative', myOptions); const isAdministrative = await models.VnUser.hasRole(userId, 'administrative', myOptions);
filter.where = {alertLevel: 0}; let where = {alertLevel: 0};
if (isSalesPerson) if (isSalesPerson)
filter.where = {or: [{alertLevel: 0}, {code: 'PICKER_DESIGNED'}]}; where = {or: [{alertLevel: 0}, {code: 'PICKER_DESIGNED'}]};
else if (isProduction || isAdministrative)
where = undefined;
if (isProduction || isAdministrative) delete filter.where; filter = mergeFilters(filter, {where});
return models.State.find(filter, myOptions); return models.State.find(filter, myOptions);
}; };