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

fix e2e
gitea/salix/pipeline/head This commit is unstable Details

This commit is contained in:
Alex Moreno 2022-10-31 15:07:22 +01:00
parent b37c257885
commit e7047e982f
5 changed files with 5 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
back/model-config.json
View File

@ -53,9 +53,6 @@
"EmailUser": {
"dataSource": "vn"
},
"FuncionalityAcl": {
"dataSource": "vn"
},
"Image": {
"dataSource": "vn"
},

24
back/models/funcionalityAcl.json
View File

@ -1,24 +0,0 @@
{
"name": "FuncionalityAcl",
"base": "VnModel",
"options": {
"mysql": {
"table": "salix.funcionalityAcl"
}
},
"properties": {
"id": {
"type": "number",
"id": true
},
"model": {
"type": "string"
},
"property": {
"type": "string"
},
"role": {
"type": "string"
}
}
}

1
db/export-data.sh
View File

@ -34,7 +34,6 @@ TABLES=(
salix
ACL
fieldAcl
funcionalityAcl
module
defaultViewConfig
)

2
loopback/server/boot/acl.js
View File

@ -1,6 +1,6 @@
module.exports = function(app) {
app.models.ACL.checkAccess = async(ctx, modelId, property, accessType = '*') => {
app.models.ACL.checkAccessAcl = async(ctx, modelId, property, accessType = '*') => {
const models = app.models;
const context = {
accessToken: ctx.req.accessToken,

8
modules/ticket/back/methods/sale/canEdit.js
View File

@ -49,10 +49,10 @@ module.exports = Self => {
const isTicketWeekly = await models.TicketWeekly.findOne({where: {ticketFk: ticketId}}, myOptions);
const hasSaleFloramondo = salesData.find(sale => sale.item().isFloramondo);
const canEditTracked = await models.ACL.checkAccess(ctx, 'Sale', 'editTracked');
const canEditCloned = await models.ACL.checkAccess(ctx, 'Sale', 'editCloned');
const canEditWeekly = await models.ACL.checkAccess(ctx, 'Ticket', 'editWeekly');
const canEditFloramondo = await models.ACL.checkAccess(ctx, 'Sale', 'editFloramondo');
const canEditTracked = await models.ACL.checkAccessAcl(ctx, 'Sale', 'editTracked');
const canEditCloned = await models.ACL.checkAccessAcl(ctx, 'Sale', 'editCloned');
const canEditWeekly = await models.ACL.checkAccessAcl(ctx, 'Ticket', 'editWeekly');
const canEditFloramondo = await models.ACL.checkAccessAcl(ctx, 'Sale', 'editFloramondo');
const shouldEditTracked = canEditTracked || !hasSaleTracking;
const shouldEditCloned = canEditCloned || !hasSaleCloned;