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

pequeño refactor CR JOAN

This commit is contained in:
gerard 2018-05-10 13:39:11 +02:00
parent 1af698acc3
commit 4ebca3f3cb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/loopback/common/models/state.js
View File

@ -7,7 +7,7 @@ module.exports = Self => {
* @param {Integer} stateId The user id * @param {Integer} stateId The user id
* @return {Boolean} %true if user has the role, %false otherwise * @return {Boolean} %true if user has the role, %false otherwise
*/ */
Self.isAlertLevel0 = async function(stateId) { Self.isAlertLevelZero = async function(stateId) {
let result = await Self.rawSql( let result = await Self.rawSql(
`SELECT alertLevel `SELECT alertLevel
FROM vn.state FROM vn.state

4
services/ticket/common/models/ticket-tracking.js
View File

@ -10,10 +10,10 @@ module.exports = function(Self) {
let isEmployee = await models.Account.hasRole(userId, 'employee'); let isEmployee = await models.Account.hasRole(userId, 'employee');
let isProduction = await models.Account.hasRole(userId, 'production'); let isProduction = await models.Account.hasRole(userId, 'production');
let isAlertLevel0 = await models.State.isAlertLevel0(ctx.instance.stateFk); let isAlertLevelZero = await models.State.isAlertLevelZero(ctx.instance.stateFk);
let ticketAlertLevel = await models.TicketState.findOne({where: {id: ctx.instance.ticketFk}, fields: ["alertLevel"]}); let ticketAlertLevel = await models.TicketState.findOne({where: {id: ctx.instance.ticketFk}, fields: ["alertLevel"]});
if ((!isProduction && !isAlertLevel0) || !isEmployee || (isEmployee && ticketAlertLevel != 0 && !isProduction)) if ((!isProduction && !isAlertLevelZero) || !isEmployee || (isEmployee && ticketAlertLevel != 0 && !isProduction))
throw new Error("You don't have enough privileges to do that"); throw new Error("You don't have enough privileges to do that");
let user = await models.Worker.findOne({where: {userFk: userId}}); let user = await models.Worker.findOne({where: {userFk: userId}});