From f6e2a5900859bb96592a24e356a7546a98e196ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Thu, 17 Jul 2014 13:02:00 +0200 Subject: [PATCH] Correctly handle GET requests on /api/printer/{tool|bed} when printer is not operational Closes #515 --- src/octoprint/server/api/printer.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/octoprint/server/api/printer.py b/src/octoprint/server/api/printer.py index a4229729..39189870 100644 --- a/src/octoprint/server/api/printer.py +++ b/src/octoprint/server/api/printer.py @@ -125,6 +125,9 @@ def printerToolCommand(): @api.route("/printer/tool", methods=["GET"]) def printerToolState(): + if not printer.isOperational(): + return make_response("Printer is not operational", 409) + def deleteBed(x): data = dict(x) @@ -181,6 +184,9 @@ def printerBedCommand(): @api.route("/printer/bed", methods=["GET"]) def printerBedState(): + if not printer.isOperational(): + return make_response("Printer is not operational", 409) + def deleteTools(x): data = dict(x) @@ -189,7 +195,11 @@ def printerBedState(): del data[k] return data - return jsonify(_getTemperatureData(deleteTools)) + data = _getTemperatureData(deleteTools) + if isinstance(data, Response): + return data + else: + return jsonify(data) ##~~ Print head