diff --git a/account_manager/views/user_views.py b/account_manager/views/user_views.py index 408aaad..7df64f7 100644 --- a/account_manager/views/user_views.py +++ b/account_manager/views/user_views.py @@ -25,12 +25,13 @@ def realm_user_detail(request, realm_id, user_dn): realm = Realm.objects.get(id=realm_id) LdapUser.base_dn = realm.ldap_base_dn user = LdapUser.objects.get(dn=user_dn) + groups = LdapGroup.objects.filter(members=user.dn) if realm_id and (request.user.is_superuser or len( Realm.objects.filter(id=realm_id).filter( admin_group__user__username__contains=request.user.username)) > 0): return render(request, 'user/realm_user_detail.jinja2', {'user': user, 'realm': realm}) else: - return render(request, 'user/user_detail.jinja2', {'user': user, 'realm': realm}) + return render(request, 'user/user_detail.jinja2', {'user': user, 'groups': groups, 'realm': realm}) @login_required diff --git a/templates/base.jinja2 b/templates/base.jinja2 index 4b37a4b..5bbbf5b 100644 --- a/templates/base.jinja2 +++ b/templates/base.jinja2 @@ -30,15 +30,24 @@ {# ===== Body ===== #} - -{% if request.user.is_authenticated %} - Hi {{ request.user.username }}! -

Logout

-

Passwort zurücksetzen

-{% else %} -

Du bist nicht eingelogt

- Login -{% endif %} + + + {% block body %}
{% block bottom_nav %}{% endblock %}
diff --git a/templates/user/realm_user_detail.jinja2 b/templates/user/realm_user_detail.jinja2 index 69fa719..9c57809 100644 --- a/templates/user/realm_user_detail.jinja2 +++ b/templates/user/realm_user_detail.jinja2 @@ -1,21 +1,23 @@ {% extends 'realm/realm_detailed.jinja2' %} {% block extra_content %} - {% if not form %} -

DN: {{ user.dn }}

-

Nutzername: {{ user.username }}

-

Vorname: {{ user.first_name }}

-

Nachname: {{ user.last_name }}

-

Email: {{ user.email }}

-

Passwort: {{ user.password }}

-

Telefon: {{ user.phone }}

-

Mobiltelefon: {{ user.mobile_phone }}

- Update User - Delete User - {% else %} -
- - {{ form.as_p()|safe }} - -
- {% endif %} +
+ {% if not form %} +

DN: {{ user.dn }}

+

Nutzername: {{ user.username }}

+

Vorname: {{ user.first_name }}

+

Nachname: {{ user.last_name }}

+

Email: {{ user.email }}

+

Passwort: {{ user.password }}

+

Telefon: {{ user.phone }}

+

Mobiltelefon: {{ user.mobile_phone }}

+ Update User + Delete User + {% else %} +
+ + {{ form.as_p()|safe }} + +
+ {% endif %} +
{% endblock %} \ No newline at end of file diff --git a/templates/user/user_detail.jinja2 b/templates/user/user_detail.jinja2 index fa9909a..cdd990b 100644 --- a/templates/user/user_detail.jinja2 +++ b/templates/user/user_detail.jinja2 @@ -1,21 +1,55 @@ {% extends 'base.jinja2' %} {% block content %} - {% if not form %} -

DN: {{ user.dn }}

-

Nutzername: {{ user.username }}

-

Vorname: {{ user.first_name }}

-

Nachname: {{ user.last_name }}

-

Email: {{ user.email }}

-

Passwort: {{ user.password }}

-

Telefon: {{ user.phone }}

-

Mobiltelefon: {{ user.mobile_phone }}

- Update User - Delete User - {% else %} -
- - {{ form.as_p()|safe }} - -
- {% endif %} +
+
+
+ {% if not form %} +
+
+
{{ user.username }}
+
{{ user.first_name }}, {{ user.last_name }}
+
    + {% if groups %} +
  • + Gruppen: + {% for group in groups %} + {{ group.name }} + {% endfor %} +
    • + {% endif %} +
  • Email: {{ user.email }}
    • +
  • Passwort: {{ user.password }} +
    • +
  • Telefon: {{ user.phone }}
    • +
  • Mobiltelefon: {{ user.mobile_phone }}
    • +
+
+
+ Update + User +
+
+ Delete + User +
+
+
+
+ {#

DN: {{ user.dn }}

#} + {% else %} +
+ + {{ form.as_p()|safe }} + +
+ {% endif %} +
+
+
{% endblock %} \ No newline at end of file