add redirect to current page after login
This commit is contained in:
@@ -25,7 +25,11 @@ def loginPage(request):
|
|||||||
user = User.objects.create_user(auth_user.lower())
|
user = User.objects.create_user(auth_user.lower())
|
||||||
|
|
||||||
login(request, user)
|
login(request, user)
|
||||||
return redirect('home')
|
|
||||||
|
try:
|
||||||
|
return redirect(request.GET.get('next'))
|
||||||
|
except:
|
||||||
|
return redirect('home')
|
||||||
else:
|
else:
|
||||||
messages.info(request, 'username or password is incorrect')
|
messages.info(request, 'username or password is incorrect')
|
||||||
|
|
||||||
|
|||||||
@@ -50,19 +50,19 @@ footer {
|
|||||||
<div class="top-bar-right">
|
<div class="top-bar-right">
|
||||||
<ul class="dropdown vertical medium-horizontal menu" data-responsive-menu="drilldown medium-dropdown" data-animate-heigt="true">
|
<ul class="dropdown vertical medium-horizontal menu" data-responsive-menu="drilldown medium-dropdown" data-animate-heigt="true">
|
||||||
{% if request.user.is_authenticated %}
|
{% if request.user.is_authenticated %}
|
||||||
<li><a role="menuitem" style="color: black; background: lightgrey">Hallo {{request.user.username}}</a></li>
|
<li><a role="menuitem" style="color: black; background: lightgrey">Hallo {{ request.user.username }}</a></li>
|
||||||
<li><a href="/admin" style="background: lightgrey;">Admin</a></li>
|
<li><a href="/admin" style="background: lightgrey;">Admin</a></li>
|
||||||
<li><a href="{%url 'tasks'%}" style="background: lightgrey;">Tasks</a></li>
|
<li><a href="{% url 'tasks' %}" style="background: lightgrey;">Tasks</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<li><a href="{% url 'posts.index' %}">Aktuelles</a></li>
|
<li><a href="{% url 'posts.index' %}">Aktuelles</a></li>
|
||||||
<!-- show active members first -->
|
<!-- show active members first -->
|
||||||
<li><a href="{% url 'members'%}A">Fachschaft</a></li>
|
<li><a href="{% url 'members' %}A">Fachschaft</a></li>
|
||||||
<li><a href="/fotos/">Fotos</a></li>
|
<li><a href="/fotos/">Fotos</a></li>
|
||||||
<li><a href="/blackboard">Blackboard</a></li>
|
<li><a href="/blackboard">Blackboard</a></li>
|
||||||
{% if request.user.is_authenticated %}
|
{% if request.user.is_authenticated %}
|
||||||
<li><a href="{%url 'logout'%}">Logout</a></li>
|
<li><a href="{% url 'logout' %}">Logout</a></li>
|
||||||
{% else %}
|
{% else %}
|
||||||
<li><a href="{%url 'login'%}">Login</a></li>
|
<li><a href="{% url 'login' %}?next={{ request.path }}">Login</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user