Skip to content
Snippets Groups Projects
Commit fb4c2982 authored by Tom Teichler's avatar Tom Teichler :beers:
Browse files

Merge branch 'issue77' into 'master'

Add search field to navbar. Advances #77.

See merge request !52
parents 6f0b83fc 333b6b84
No related branches found
No related tags found
1 merge request!52Add search field to navbar. Advances #77.
......@@ -22,7 +22,12 @@
<div class="collapse navbar-collapse" id="navbar-main">
<ul class="nav navbar-nav ml-auto">
{% if user.is_authenticated %}
{% if user.is_member %}
<form class="form-inline" action="{% url "ticdesk_org:person" %}" method="GET">
<input class="form-control mr-sm-2" type="search" placeholder="Benutzername" aria-label="Search" name="uid" />
</form>
{% endif %}
{% if user.is_authenticated %}
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" data-toggle="dropdown" id="navbarDropdown" aria-expanded="false" role="button" aria-haspopup="true" href="#">
{% blocktrans %}Veranstaltungen{% endblocktrans %}
......
......@@ -25,7 +25,8 @@ def person(request, uid=None):
# Redirect to own listing if no uid given
if uid is None:
return redirect(reverse('org:person_by_uid', args=[request.user.username]))
target_uid = request.GET.get('uid') or request.user.username
return redirect(reverse('org:person_by_uid', args=[target_uid]))
# Get person and check access
try:
......@@ -397,7 +398,7 @@ def delete_voucher(request, voucher_id):
current_voucher.deleted = True
current_voucher.save()
context['deleted'] = True
return render(request, 'ticdesk_org/vouchers.html', context)
......
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