From ac345daba283867d0faa9f19af8af4d140716739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Thu, 30 Nov 2017 17:25:27 +0100 Subject: [PATCH] Don't output pi model & serial in about dialog Too public for this kind of information after all. The OctoPi version is enough info. --- src/octoprint/plugins/octopi_support/__init__.py | 9 +-------- .../templates/octopi_support_about.jinja2 | 10 ---------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/src/octoprint/plugins/octopi_support/__init__.py b/src/octoprint/plugins/octopi_support/__init__.py index 19780919..b5243ace 100644 --- a/src/octoprint/plugins/octopi_support/__init__.py +++ b/src/octoprint/plugins/octopi_support/__init__.py @@ -125,14 +125,7 @@ class OctoPiSupportPlugin(octoprint.plugin.EnvironmentDetectionPlugin, ] def get_template_vars(self): - version = self._get_version() - cpuinfo = self._get_cpuinfo() - model = self._get_model() - - return dict(version=version, - rpi_revision=cpuinfo.get("revision", "unknown"), - rpi_serial=cpuinfo.get("serial", "unknown"), - rpi_model=model) + return dict(version=self._get_version()) #~~ Helpers diff --git a/src/octoprint/plugins/octopi_support/templates/octopi_support_about.jinja2 b/src/octoprint/plugins/octopi_support/templates/octopi_support_about.jinja2 index dcc15c26..050bc8cf 100644 --- a/src/octoprint/plugins/octopi_support/templates/octopi_support_about.jinja2 +++ b/src/octoprint/plugins/octopi_support/templates/octopi_support_about.jinja2 @@ -30,13 +30,3 @@ www.gnu.org/licenses/gpl-3.0.en.html.

-{% if plugin_octopi_support_rpi_model != "unknown" %} -

{{ _('About this Raspberry Pi') }}

- - -{% endif %} -