Skip to content

Commit

Permalink
Permissions improvements + bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
Willmac16 committed Mar 8, 2021
1 parent 87e975a commit 1daacb4
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 5 deletions.
17 changes: 16 additions & 1 deletion octoprint_translatemodel/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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']))
Expand Down
6 changes: 3 additions & 3 deletions octoprint_translatemodel/templates/translatemodel_tab.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
<input type="radio" data-bind="checked: afterTranslate" id="doNothingRadio" value="nothing" checked> Do Nothing
</label>
<label class="radio inline">
<input type="radio" data-bind="checked: afterTranslate" id="loadRadio" value="load"> Load
<input type="radio" data-bind="checked: afterTranslate, enable: loginState.hasPermissionKo(access.permissions.FILES_SELECT)" id="loadRadio" value="load"> Load
</label>
<label class="radio inline">
<input type="radio" data-bind="checked: afterTranslate" id="printRadio" value="print"> Print
<input type="radio" data-bind="checked: afterTranslate, enable: loginState.hasAllPermissionsKo(access.permissions.FILES_SELECT, access.permissions.FILES_PRINT)" id="printRadio" value="print"> Print
</label>
<label class="radio inline">
<input type="radio" data-bind="checked: afterTranslate" id="printAndDeleteRadio" value="printAndDelete"> Print and Delete
<input type="radio" data-bind="checked: afterTranslate, enable: loginState.hasAllPermissionsKo(access.permissions.FILES_SELECT, access.permissions.FILES_PRINT)" id="printAndDeleteRadio" value="printAndDelete"> Print and Delete
</label>
</form>

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1daacb4

Please sign in to comment.