From b1e75a1033a6736ea45def66e4cb9b379ca6f20b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Thu, 19 May 2016 10:42:27 +0200 Subject: [PATCH] Make connection dialog visible for users again Should actually not have been limited to admins-only, that was an accident during switching to 1.2.0 implementation. Once #1110 is tackled, this should be something configurable based on the role as well. --- src/octoprint/server/views.py | 2 +- src/octoprint/static/js/app/viewmodels/connection.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/octoprint/server/views.py b/src/octoprint/server/views.py index 194b075c..3b74bb74 100644 --- a/src/octoprint/server/views.py +++ b/src/octoprint/server/views.py @@ -128,7 +128,7 @@ def index(): # sidebar templates["sidebar"]["entries"]= dict( - connection=(gettext("Connection"), dict(template="sidebar/connection.jinja2", _div="connection", icon="signal", styles_wrapper=["display: none"], data_bind="visible: loginState.isAdmin")), + connection=(gettext("Connection"), dict(template="sidebar/connection.jinja2", _div="connection", icon="signal", styles_wrapper=["display: none"], data_bind="visible: loginState.isUser")), state=(gettext("State"), dict(template="sidebar/state.jinja2", _div="state", icon="info-sign")), files=(gettext("Files"), dict(template="sidebar/files.jinja2", _div="files", icon="list", classes_content=["overflow_visible"], template_header="sidebar/files_header.jinja2")) ) diff --git a/src/octoprint/static/js/app/viewmodels/connection.js b/src/octoprint/static/js/app/viewmodels/connection.js index 032f55a8..e98d4176 100644 --- a/src/octoprint/static/js/app/viewmodels/connection.js +++ b/src/octoprint/static/js/app/viewmodels/connection.js @@ -93,7 +93,7 @@ $(function() { } else if (!self.isOperational() && !connectionTab.hasClass("in")) { connectionTab.collapse("show"); } - } + }; self._processStateData = function(data) { self.previousIsOperational = self.isOperational(); @@ -106,7 +106,7 @@ $(function() { self.isReady(data.flags.ready); self.isLoading(data.flags.loading); - if (self.loginState.isAdmin() && self.previousIsOperational != self.isOperational()) { + if (self.loginState.isUser() && self.previousIsOperational != self.isOperational()) { // only open or close if the panel is visible (for admins) and // the state just changed to avoid thwarting manual open/close self.openOrCloseOnStateChange();