mgoetz/ldap_account_manager
Archived
2
2
Fork 0
Code Issues 9 Pull Requests Releases 2 Wiki Activity

Add deletion sign for normal user view

Browse Source
This commit is contained in:
Götz 2019-05-16 02:30:05 +02:00
parent 6cd5753056
commit 00cea530ab
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/account_manager/views/user_views.py
View File

@ -72,8 +72,9 @@ def user_detail(request, realm_id, user_dn):
LdapGroup.base_dn = LdapGroup.ROOT_DN LdapGroup.base_dn = LdapGroup.ROOT_DN
user = LdapUser.objects.get(dn=user_dn) user = LdapUser.objects.get(dn=user_dn)
user_wrapper = LdapUser.get_extended_user(user)
groups = LdapGroup.objects.filter(members=user.dn) groups = LdapGroup.objects.filter(members=user.dn)
return render(request, 'user/user_detail.jinja2', {'user': user, 'groups': groups, 'realm': realm}) return render(request, 'user/user_detail.jinja2', {'user': user_wrapper, 'groups': groups, 'realm': realm})
@login_required @login_required

25
src/templates/user/user_detail.jinja2
View File

@ -8,8 +8,14 @@
<div class="col-12 col-sm-8 col-md-7 col-lg-5 col-xl-4 bg-white text-dark p-3 mt-5"> <div class="col-12 col-sm-8 col-md-7 col-lg-5 col-xl-4 bg-white text-dark p-3 mt-5">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<h5 class="card-title">{{ user.username }}</h5> {% if user.deleted_user.deletion_date %}
<h6 class="card-subtitle mb-2 text-muted">{{ user.last_name }}, {{ user.first_name }}</h6> <h5 class="card-title text-danger">{{ user.user.username }}
<small>Als gelöscht markiert</small>
</h5>
{% else %}
<h5 class="card-title">{{ user.user.username }}</h5>
{% endif %}
<h6 class="card-subtitle mb-2 text-muted">{{ user.user.last_name }}, {{ user.user.first_name }}</h6>
<ul class="list-group list-group-flush"> <ul class="list-group list-group-flush">
{% if groups %} {% if groups %}
<li class="list-group-item"> <li class="list-group-item">
@ -23,21 +29,26 @@
</li> </li>
{% endif %} {% endif %}
<li class="list-group-item"><span <li class="list-group-item"><span
class="font-weight-bold">Email:</span> {{ user.email }}</li> class="font-weight-bold">Email:</span> {{ user.user.email }}</li>
<li class="list-group-item"><span <li class="list-group-item"><span
class="font-weight-bold">Passwort:</span> <a class="font-weight-bold">Passwort:</span> <a
href="{{ url('password_change') }}">Passwort ändern</a> href="{{ url('password_change') }}">Passwort ändern</a>
</li> </li>
<li class="list-group-item"><span <li class="list-group-item"><span
class="font-weight-bold">Telefon:</span> {{ user.phone }}</li> class="font-weight-bold">Telefon:</span> {{ user.user.phone }}</li>
<li class="list-group-item"><span <li class="list-group-item"><span
class="font-weight-bold">Mobiltelefon:</span> {{ user.mobile_phone }}</li> class="font-weight-bold">Mobiltelefon:</span> {{ user.user.mobile_phone }}</li>
{% if user.deleted_user.deletion_date %}
<li class="list-group-item text-danger">
Löschvorgang: {{ user.deleted_user.deletion_date.strftime('%d.%m.%Y') }}
</li>
{% endif %}
</ul> </ul>
<div class="card-footer d-flex bg-white"> <div class="card-footer d-flex bg-white">
<a href="{{ url('user-update', args = [realm.id, user.dn]) }}" <a href="{{ url('user-update', args = [realm.id, user.user.dn]) }}"
class="btn btn-primary mr-auto p-2"><i class="fas fa-user-edit"></i> Profil class="btn btn-primary mr-auto p-2"><i class="fas fa-user-edit"></i> Profil
bearbeiten</a> bearbeiten</a>
<a href="{{ url('user-delete-confirm', args = [realm.id, user.dn]) }}" <a href="{{ url('user-delete-confirm', args = [realm.id, user.user.dn]) }}"
class="btn btn-danger p-2"><i class="fas fa-trash"></i> Profil löschen</a> class="btn btn-danger p-2"><i class="fas fa-trash"></i> Profil löschen</a>
</div> </div>
</div> </div>