aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrea Lepori <alepori@student.ethz.ch>2020-08-30 23:36:17 +0200
committerAndrea Lepori <alepori@student.ethz.ch>2020-08-30 23:36:17 +0200
commitf7fed92f02c157f1e0c1278ad78ee0f87551aea6 (patch)
treefd35c8845f347d2e765a2699db8fd48b82488d00
parentadd commit id to version (diff)
downloadscout-subs-f7fed92f02c157f1e0c1278ad78ee0f87551aea6.tar.gz
scout-subs-f7fed92f02c157f1e0c1278ad78ee0f87551aea6.zip
dynamicaly check for commit id
Diffstat (limited to '')
-rw-r--r--.gitattributes1
-rw-r--r--client/templates/client/about.html2
-rw-r--r--client/views.py5
-rw-r--r--version.txt2
4 files changed, 6 insertions, 4 deletions
diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 53a472b..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-version.txt ident
diff --git a/client/templates/client/about.html b/client/templates/client/about.html
index ea32787..8de95a9 100644
--- a/client/templates/client/about.html
+++ b/client/templates/client/about.html
@@ -13,7 +13,7 @@
<div class="card">
<div class="card-content">
<p>
- Versione software {{version}}
+ Versione software {{version}}<br>Commit ID: <a href="https://git.thearcway.org/mafaldo/scout-subs/commit/?id={{commitid}}">{{commitid}}</a>
</p>
<h5>Licenza</h5>
<blockquote>
diff --git a/client/views.py b/client/views.py
index 11ff367..01909d7 100644
--- a/client/views.py
+++ b/client/views.py
@@ -11,6 +11,7 @@ from django.template.loader import get_template
from io import BytesIO
import pdfkit
import base64
+from subprocess import check_output
def index(request):
@@ -298,5 +299,7 @@ def about(request):
version = f.read()
if version.startswith("0"):
version = "Beta " + version
- context = {"version": version}
+ commitid = check_output(["git", "rev-parse", "HEAD"]).decode()
+ version = version[:version.find(" $Id: ")]
+ context = {"version": version, "commitid": commitid}
return render(request, 'client/about.html', context)
diff --git a/version.txt b/version.txt
index 2b1e0ab..3b04cfb 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.2 $Id$
+0.2