From 2b51501a57321d5e7b256c9dab3770fc5a8f1615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Mon, 9 Mar 2015 10:27:10 +0100 Subject: [PATCH] Fixed key generation for template rendering Key was only generated correctly if a suffix was set, causing templates from plugins of the same type to override each other. --- src/octoprint/server/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py index a3258eb0..0dc27c3d 100644 --- a/src/octoprint/server/__init__.py +++ b/src/octoprint/server/__init__.py @@ -278,7 +278,8 @@ def index(): else: data = include[1] - key = "plugin_" + name + data["suffix"] if "suffix" in data else "" + suffix = data["suffix"] if "suffix" in data else "" + key = "plugin_" + name + suffix if "replaces" in data: key = data["replaces"] templates[t]["entries"][key] = include