From 1daacb4811719e1548fc7926ec19489823bd353d Mon Sep 17 00:00:00 2001 From: Will MacCormack Date: Sun, 7 Mar 2021 16:39:20 -0800 Subject: [PATCH] Permissions improvements + bump version --- octoprint_translatemodel/__init__.py | 17 ++++++++++++++++- .../templates/translatemodel_tab.jinja2 | 6 +++--- setup.py | 2 +- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/octoprint_translatemodel/__init__.py b/octoprint_translatemodel/__init__.py index df64353..24a2f26 100644 --- a/octoprint_translatemodel/__init__.py +++ b/octoprint_translatemodel/__init__.py @@ -133,9 +133,24 @@ def on_api_command(self, command, data): if Permissions.FILES_UPLOAD.can() and octoprint.filemanager.valid_file_type(data['file'], type="gcode"): index = data['file'] + data['x'] + data['y'] + at = "" if (index not in self.translating): self.translating.append(index) - worker = TranslateWorker(self, data['x'], data['y'], data['file'], data['at']) + if data['at'] == "load": + if Permissions.FILES_SELECT.can(): + at = data['at'] + + if data['at'] == "print" or data['at'] == "printAndDelete": + if Permissions.FILES_SELECT.can(): + if Permissions.PRINT.can(): + at = data['at'] + else: + at = "load" + else: + at = "nothing" + + + worker = TranslateWorker(self, data['x'], data['y'], data['file'], at) worker.start() else: self._plugin_manager.send_plugin_message("translatemodel", dict(state='running', file=data['file'], x=data['x'], y=data['y'])) diff --git a/octoprint_translatemodel/templates/translatemodel_tab.jinja2 b/octoprint_translatemodel/templates/translatemodel_tab.jinja2 index 09b01ca..2e61399 100644 --- a/octoprint_translatemodel/templates/translatemodel_tab.jinja2 +++ b/octoprint_translatemodel/templates/translatemodel_tab.jinja2 @@ -20,13 +20,13 @@ Do Nothing diff --git a/setup.py b/setup.py index 84933bc..e397e81 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ plugin_name = "OctoPrint-TranslateModel" # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module -plugin_version = "0.1.2-pre" +plugin_version = "0.1.2" # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin # module