From d86bcf69dc48a3cea1c1ae1cce77bb4fc7b62900 Mon Sep 17 00:00:00 2001 From: Douglas Thor Date: Tue, 26 Feb 2019 09:27:17 -0800 Subject: [PATCH 1/3] Patch 'render_template' in routes.py to also show the version. --- src/trendlines/routes.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/trendlines/routes.py b/src/trendlines/routes.py index f7231fc..16b0cc0 100644 --- a/src/trendlines/routes.py +++ b/src/trendlines/routes.py @@ -3,10 +3,11 @@ import json from datetime import datetime from datetime import timezone +from functools import partial from flask import Blueprint from flask import jsonify -from flask import render_template +from flask import render_template as _render_template from flask import request # peewee @@ -16,6 +17,7 @@ from playhouse.shortcuts import update_model_from_dict from trendlines import logger +from trendlines.__about__ import __version__ from . import db from .error_responses import ErrorResponse from . import utils @@ -24,6 +26,10 @@ api = Blueprint('api', __name__) +# Make sure all pages show our version. +render_template = partial(_render_template, version=__version__) + + @pages.route('/', methods=['GET']) def index(): """ From 18ad80eede0a6e06650c1665cf4360f4900d6dc5 Mon Sep 17 00:00:00 2001 From: Douglas Thor Date: Tue, 26 Feb 2019 09:27:31 -0800 Subject: [PATCH 2/3] Add the version to layout.html --- src/trendlines/templates/trendlines/layout.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/trendlines/templates/trendlines/layout.html b/src/trendlines/templates/trendlines/layout.html index 5c0cd6b..edb78d4 100644 --- a/src/trendlines/templates/trendlines/layout.html +++ b/src/trendlines/templates/trendlines/layout.html @@ -23,6 +23,7 @@

Trendlines

+

v{{ version }}

{% block body %} From e6826756e96a0c51c069b95389c56d7fa37e43ed Mon Sep 17 00:00:00 2001 From: Douglas Thor Date: Tue, 26 Feb 2019 09:32:26 -0800 Subject: [PATCH 3/3] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fce3a00..e2fde94 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ blocking #47. (#100) + Moved javascript out of HTML files. (#47) + The tree is now auto-expanded by default. (#105) ++ The program version is now displayed on all pages. (#109) ## v0.3.0 (2019-01-28)