This commit is contained in:
parent
7464b579a0
commit
1a379e8091
|
@ -23,6 +23,7 @@ COPY \
|
|||
RUN npm install
|
||||
|
||||
COPY cupsd.conf /etc/cups/
|
||||
RUN useradd admin && usermod -g lpadmin admin
|
||||
|
||||
COPY \
|
||||
main.js \
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
useradd admin
|
||||
echo "admin:$CUPS_PASSWORD" | chpasswd
|
||||
usermod -g lpadmin admin
|
||||
cupsd
|
||||
|
||||
exec $@
|
||||
|
|
|
@ -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;
|
||||
});
|
||||
|
||||
|
|
|
@ -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
|
Loading…
Reference in New Issue