refs #4550 Fixes

Dockerfile

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

entrypoint.sh

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

print-server.js

@@ -85,7 +85,7 @@ class PrintServer {
 
         try {
             await conn.beginTransaction();
-            [[printJob]] = await conn.query(selectQuery, ['LabelCollection', this.conf.printers]);
+            [[printJob]] = await conn.query(selectQuery);
             if (!printJob) return;
 
             jobId = printJob.id;
@@ -105,9 +105,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;
                 });
 

sql/selectQueued.sql

@@ -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 = ?
+	WHERE pq.statusCode = 'queued'
-		AND pq.statusCode = 'queued'
 		AND NOT r.method IS NULL
 	ORDER BY pq.priorityFk ASC
 	LIMIT 1