Skip to content
Snippets Groups Projects
Commit b58513a8 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '368-login-page-links-do-not-work' into 'master'

Resolve "Login page links do not work"

Closes #368

See merge request NCER-PD/scheduling-system!303
parents ffdbe4fc 098cb6be
No related branches found
No related tags found
1 merge request!303Resolve "Login page links do not work"
Pipeline #38123 passed
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
......
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
}
......@@ -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 -->
......
......@@ -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 -->
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment