From 098cb6bef14ebedc635cd94ef594b2554d53d3e2 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Thu, 4 Feb 2021 11:29:24 +0100
Subject: [PATCH] login page contains valid link to help with account
---
CHANGELOG | 7 +++++++
smash/smash/context_processors.py | 5 +++--
smash/web/templates/_base.html | 2 +-
smash/web/templates/login.html | 3 +--
4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index d20399e2..5cf57c51 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+smasch (1.0.0~beta.5-1) unstable; urgency=low
+
+ * bug fix: login page did not contain valid link to help with account
+ (#368)
+
+ -- Piotr Gawron <piotr.gawron@uni.lu> Thu, 04 Feb 2021 12:00:00 +0200
+
smasch (1.0.0~beta.4-1) unstable; urgency=low
* bug fix: MEDIA_ROOT was overwritten by tests that messed up with
diff --git a/smash/smash/context_processors.py b/smash/smash/context_processors.py
index f60066ac..2d0918cb 100644
--- a/smash/smash/context_processors.py
+++ b/smash/smash/context_processors.py
@@ -1,5 +1,5 @@
from web.models import ConfigurationItem
-from web.models.constants import LOGIN_PAGE_BACKGROUND_IMAGE
+from web.models.constants import LOGIN_PAGE_BACKGROUND_IMAGE, DEFAULT_FROM_EMAIL
# noinspection PyUnusedLocal
@@ -8,5 +8,6 @@ def login_background(request):
Context processor - these values will be available to templates once registered in settings.py
"""
return {
- 'login_page_background': ConfigurationItem.objects.get(type=LOGIN_PAGE_BACKGROUND_IMAGE).value
+ 'login_page_background': ConfigurationItem.objects.get(type=LOGIN_PAGE_BACKGROUND_IMAGE).value,
+ 'email': ConfigurationItem.objects.get(type=DEFAULT_FROM_EMAIL).value
}
diff --git a/smash/web/templates/_base.html b/smash/web/templates/_base.html
index c7a7abef..04b403df 100644
--- a/smash/web/templates/_base.html
+++ b/smash/web/templates/_base.html
@@ -256,7 +256,7 @@ desired effect
{% block footer %}
<!-- To the right -->
<div class="pull-right hidden-xs">
- Version: <strong>1.0.0~beta.4</strong>
+ Version: <strong>1.0.0~beta.5</strong>
</div>
<!-- Default to the left -->
diff --git a/smash/web/templates/login.html b/smash/web/templates/login.html
index b3d6f45a..6ef7a47f 100644
--- a/smash/web/templates/login.html
+++ b/smash/web/templates/login.html
@@ -105,8 +105,7 @@
<hr/>
- <a href="#">I forgot my password</a><br>
- <a href="#">I have an issue with account</a>
+ <a href="mailto:{{ email }}?subject=Problem with smasch account">I have an issue with account</a>
</div>
<!-- /.login-box-body -->
--
GitLab