Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Joan Sanchez 2023-03-23 08:20:33 +01:00
commit 7b5e0bae8e
8 changed files with 16 additions and 22 deletions

View File

@ -3,7 +3,8 @@
"base": "Loggable",
"log": {
"model": "EntryLog",
"relation": "entry"
"relation": "entry",
"grabUser": true
},
"options": {
"mysql": {
@ -70,4 +71,4 @@
"foreignKey": "packageFk"
}
}
}
}

View File

@ -2,7 +2,8 @@
"name": "Entry",
"base": "Loggable",
"log": {
"model":"EntryLog"
"model":"EntryLog",
"grabUser": true
},
"options": {
"mysql": {

View File

@ -3,7 +3,8 @@
"base": "Loggable",
"log": {
"model": "ItemLog",
"showField": "id"
"showField": "id",
"grabUser": true
},
"options": {
"mysql": {
@ -220,4 +221,4 @@
}
}
}
}
}

View File

@ -2,7 +2,8 @@
"name": "Route",
"base": "Loggable",
"log": {
"model":"RouteLog"
"model":"RouteLog",
"grabUser": true
},
"options": {
"mysql": {

View File

@ -127,19 +127,6 @@ module.exports = Self => {
], myOptions);
const ticket = await models.Ticket.findById(result[1][0].newTicketId, null, myOptions);
const cleanInstance = JSON.parse(JSON.stringify(ticket));
const logRecord = {
originFk: cleanInstance.id,
userFk: myUserId,
action: 'insert',
changedModel: 'Ticket',
changedModelId: cleanInstance.id,
oldInstance: {},
newInstance: cleanInstance
};
await models.TicketLog.create(logRecord, myOptions);
if (tx) await tx.commit();

View File

@ -4,7 +4,8 @@
"log": {
"model": "TicketLog",
"relation": "ticket",
"showField": "concept"
"showField": "concept",
"grabUser": true
},
"options": {
"mysql": {

View File

@ -3,7 +3,8 @@
"base": "Loggable",
"log": {
"model":"TicketLog",
"showField": "id"
"showField": "id",
"grabUser": true
},
"options": {
"mysql": {

View File

@ -3,7 +3,8 @@
"base": "Loggable",
"log": {
"model":"TravelLog",
"showField": "ref"
"showField": "ref",
"grabUser": true
},
"options": {
"mysql": {