From 84f568a80926fef67d11e7e0fb3e8d193b591799 Mon Sep 17 00:00:00 2001
From: Andreas <andreasv@fsmpi.rwth-aachen.de>
Date: Fri, 7 Apr 2017 20:18:04 +0200
Subject: [PATCH] enhanced commit msg in footer
---
server.py | 3 ++-
templates/base.html | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/server.py b/server.py
index 852d555..7ecee0c 100644
--- a/server.py
+++ b/server.py
@@ -57,7 +57,8 @@ if config['DEBUG']:
# get git commit
import subprocess
-app.jinja_env.globals['gitversion'] = subprocess.check_output(['git', "log", "-g", "-1", "--pretty=%H # %h # %d # %s"]).decode('UTF-8').split('#')
+output = subprocess.check_output(['git', "log", "-g", "-1", "--pretty=%H # %h # %d # %s"]).decode('UTF-8').split('#')
+app.jinja_env.globals['gitversion'] = { 'hash': output[1], 'longhash': output[0], 'branch': output[2], 'msg': output[3] }
if not config.get('SECRET_KEY', None):
config['SECRET_KEY'] = os.urandom(24)
diff --git a/templates/base.html b/templates/base.html
index 08b7add..d62d543 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -147,7 +147,7 @@
</li>
{% if ismod() or config.DEBUG %}
<li class="pull-right">
- <a target="_blank" href="https://git.fsmpi.rwth-aachen.de/videoagwebsite/videoagwebsite/commit/{{ gitversion[0] }}"><span title="{{ gitversion[2] }} {{ gitversion[1] }}: {{ gitversion[3] }}" data-toggle="tooltip">{{ gitversion[1] }}</span></a>
+ <a target="_blank" href="https://git.fsmpi.rwth-aachen.de/videoagwebsite/videoagwebsite/commit/{{ gitversion.longhash }}"><span title="{{ gitversion.branch }} {{ gitversion.hash }}: {{ gitversion.msg }}" data-toggle="tooltip">{{ gitversion.hash }}</span></a>
<span>{{ gethostname() }}</span>
</li>
{% endif %}
--
GitLab