From c229f51556132b11d67684ff4bdc6ded4c178a2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 3 Apr 2017 23:37:21 +0200 Subject: [PATCH] Commonmark version (#321) * Allow HTML in config_version to be interpreted * Allow Markdown in config_version --- puppetboard/app.py | 3 +++ puppetboard/templates/report.html | 2 +- requirements.txt | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/puppetboard/app.py b/puppetboard/app.py index fc45f1c..20571ea 100644 --- a/puppetboard/app.py +++ b/puppetboard/app.py @@ -27,6 +27,7 @@ from puppetboard.utils import ( from puppetboard.dailychart import get_daily_reports_chart import werkzeug.exceptions as ex +import CommonMark from . import __version__ @@ -606,6 +607,8 @@ def report(env, node_name, report_id): except StopIteration: abort(404) + report.version = CommonMark.commonmark(report.version) + return render_template( 'report.html', report=report, diff --git a/puppetboard/templates/report.html b/puppetboard/templates/report.html index 0989f76..276dc74 100644 --- a/puppetboard/templates/report.html +++ b/puppetboard/templates/report.html @@ -14,7 +14,7 @@ {{ report.node }} - {{report.version}} + {{report.version|safe}} {{report.start}} diff --git a/requirements.txt b/requirements.txt index 0f51820..489e34f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,3 +7,4 @@ Werkzeug >=0.12.1 itsdangerous >=0.23 pypuppetdb >=0.3.2 requests >=2.13.0 +CommonMark==0.7.2