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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

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

2
entrypoint.sh
View File

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

3
print-server.js
View File

@ -108,9 +108,8 @@ class PrintServer {
args[row.name] = row.value; args[row.name] = row.value;
try { try {
let methodPath = this.method.replace(/{\w+}/g, function(match) { let methodPath = this.method.replace(/{\w+}/g, function(match) {
const params = {id: args.collectionFk};
const key = match.substr(1, match.length - 2); const key = match.substr(1, match.length - 2);
const value = params[key]; const value = args[key];
return value !== undefined ? value : match; return value !== undefined ? value : match;
}); });

3
sql/selectQueued.sql
View File

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