refs #4550 Bugs fixed
gitea/printnatura/pipeline/head This commit looks good Details

This commit is contained in:
Guillermo Bonet 2022-11-28 09:18:55 +01:00
parent 7464b579a0
commit 1a379e8091
4 changed files with 3 additions and 6 deletions

View File

@ -23,6 +23,7 @@ COPY \
RUN npm install
COPY cupsd.conf /etc/cups/
RUN useradd admin && usermod -g lpadmin admin
COPY \
main.js \

View File

@ -1,8 +1,6 @@
#!/bin/bash
useradd admin
echo "admin:$CUPS_PASSWORD" | chpasswd
usermod -g lpadmin admin
cupsd
exec $@

View File

@ -108,9 +108,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;
});

View File

@ -8,8 +8,7 @@ SELECT pq.id,
JOIN report r ON r.id = pq.reportFk
JOIN printQueueArgs pqa ON pqa.printQueueFk = pq.id
LEFT JOIN printer p ON p.id = pq.printerFk
WHERE r.name = ?
AND pq.statusCode = 'queued'
WHERE pq.statusCode = 'queued'
AND NOT r.method IS NULL
ORDER BY pq.priorityFk ASC
LIMIT 1