verdnatura/printnatura
verdnatura
/
printnatura
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs #4550 Fixed bug: not ended transaction
gitea/printnatura/pipeline/head This commit looks good Details

This commit is contained in:
Guillermo Bonet 2022-11-28 09:09:30 +01:00
parent ce1312fdf1 b9b83b9795
commit 5a104e3b62
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
print-server.js
View File

@ -85,11 +85,16 @@ class PrintServer {
try {
await conn.beginTransaction();
[[printJob]] = await conn.query(selectQuery, ['LabelCollection', this.conf.printers]);
<<<<<<< HEAD
[[printJob]] = await conn.query(selectQuery);
if (!printJob) {
conn.rollback();
return;
}
=======
[[printJob]] = await conn.query(selectQuery);
if (!printJob) return;
>>>>>>> b9b83b979507038a3f39ef7c1ed47d9c316191fe
jobId = printJob.id;
this.method = printJob.method;
@ -108,9 +113,8 @@ class PrintServer {
args[row.name] = row.value;
try {
let methodPath = this.method.replace(/{\w+}/g, function(match) {
const params = {id: args.collectionFk};
const key = match.substr(1, match.length - 2);
const value = params[key];
const value = args[key];
return value !== undefined ? value : match;
});