From 54f24b43f0f3ec718226c294d9fbb2da947e723e Mon Sep 17 00:00:00 2001 From: Salandora Date: Wed, 16 Dec 2015 11:35:25 +0100 Subject: [PATCH] If no system actions were configured during rendering of the page, no system menu was added to the template. hat caused system actions added during runtime (e.g. by API) to not show up until a re-rendering of the page. --- src/octoprint/server/views.py | 2 +- src/octoprint/templates/navbar/systemmenu.jinja2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/octoprint/server/views.py b/src/octoprint/server/views.py index 987f7429..f3461eba 100644 --- a/src/octoprint/server/views.py +++ b/src/octoprint/server/views.py @@ -43,7 +43,7 @@ def index(): enable_gcodeviewer = settings().getBoolean(["gcodeViewer", "enabled"]) enable_timelapse = (settings().get(["webcam", "snapshot"]) and settings().get(["webcam", "ffmpeg"])) - enable_systemmenu = settings().get(["system"]) is not None and settings().get(["system", "actions"]) is not None and len(settings().get(["system", "actions"])) > 0 + enable_systemmenu = settings().get(["system"]) is not None and settings().get(["system", "actions"]) is not None enable_accesscontrol = userManager is not None preferred_stylesheet = settings().get(["devel", "stylesheet"]) locales = dict((l.language, dict(language=l.language, display=l.display_name, english=l.english_name)) for l in LOCALES) diff --git a/src/octoprint/templates/navbar/systemmenu.jinja2 b/src/octoprint/templates/navbar/systemmenu.jinja2 index a2ee3f3b..c5e1f61c 100644 --- a/src/octoprint/templates/navbar/systemmenu.jinja2 +++ b/src/octoprint/templates/navbar/systemmenu.jinja2 @@ -1,4 +1,4 @@ - + {{ _('System') }}