Merge branch 'feature-gitversion' into 'develop'

Feature gitversion

See merge request !27
This commit is contained in:
Jan Tuomi
2017-05-24 19:40:02 +03:00
3 changed files with 10 additions and 0 deletions
+1
View File
@@ -22,3 +22,4 @@ psycopg2==2.7.1
django-bootstrap3==8.2.3
django-tables2==1.6.1
pep8==1.7.0
dealer==2.0.5
+4
View File
@@ -4,6 +4,7 @@ from webapp.views import main_index
from webapp.views import admin_index
from webapp.views import login_view
from webapp.views import logout_view
from webapp.views import about_view
urlpatterns = [
# main
@@ -13,4 +14,7 @@ urlpatterns = [
# login stuff
url(r'^login$', login_view),
url(r'^logout$', logout_view),
# git revision
url(r'^about', about_view),
]
+5
View File
@@ -47,3 +47,8 @@ def login_view(request, *args, **kwargs):
def logout_view(request, *args, **kwargs):
logout(request)
return redirect("/")
@require_http_methods(["GET"])
def about_view(request, *args, **kwargs):
return render(request, "about.html", {})