From 4547df4d4c940b4b5d7cd87869fb078b78be16f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20G=C3=B6tz?= Date: Tue, 14 May 2019 20:38:26 +0200 Subject: [PATCH] Implement last login --- src/account_manager/models.py | 2 ++ src/account_manager/views/user_views.py | 6 +++--- src/templates/macros/utils_macros.jinja2 | 8 ++++++++ src/templates/user/realm_user_detail.jinja2 | 10 +++++++++- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/account_manager/models.py b/src/account_manager/models.py index 2cb304b..b69e849 100644 --- a/src/account_manager/models.py +++ b/src/account_manager/models.py @@ -34,6 +34,8 @@ class LdapUser(Model): phone = ldap_fields.CharField(db_column='telephoneNumber', blank=True) mobile_phone = ldap_fields.CharField(db_column='mobile', blank=True) photo = ldap_fields.ImageField(db_column='photo') + last_login = ldap_fields.DateTimeField(db_column='authTimestamp', blank=True) + # photo = ldap_fields.ImageField(db_column='jpegPhoto') def __str__(self): diff --git a/src/account_manager/views/user_views.py b/src/account_manager/views/user_views.py index 3fa8f41..31b0133 100644 --- a/src/account_manager/views/user_views.py +++ b/src/account_manager/views/user_views.py @@ -41,8 +41,8 @@ def protect_cross_realm_user_access(view_func): @login_required @is_realm_admin def realm_user(request, realm_id): - realm_obj = Realm.objects.get(id=realm_id) - LdapUser.base_dn = realm_obj.ldap_base_dn + realm = Realm.objects.get(id=realm_id) + LdapUser.base_dn = realm.ldap_base_dn realm_users = LdapUser.objects.all() user_wrappers = [] for user in realm_users: @@ -54,7 +54,7 @@ def realm_user(request, realm_id): user_wrappers.append({'user': user, 'active': False}) except ObjectDoesNotExist: user_wrappers.append({'user': user, 'active': False}) - return render(request, 'realm/realm_user.jinja2', {'realm': realm_obj, 'realm_user': user_wrappers}) + return render(request, 'realm/realm_user.jinja2', {'realm': realm, 'realm_user': user_wrappers}) @login_required diff --git a/src/templates/macros/utils_macros.jinja2 b/src/templates/macros/utils_macros.jinja2 index ff3644f..c54ddfa 100644 --- a/src/templates/macros/utils_macros.jinja2 +++ b/src/templates/macros/utils_macros.jinja2 @@ -35,6 +35,7 @@ Vorname Nachname Aktiv + Letzer Login @@ -49,6 +50,13 @@ {% if user.active %} -{% else %} +{% endif %} + + {% if user.user.last_login %} + {{ user.user.last_login.strftime('%Y-%m-%d') }} + {% else %} + + + {% endif %} + {% endfor %} diff --git a/src/templates/user/realm_user_detail.jinja2 b/src/templates/user/realm_user_detail.jinja2 index ed52e2a..260d3bf 100644 --- a/src/templates/user/realm_user_detail.jinja2 +++ b/src/templates/user/realm_user_detail.jinja2 @@ -16,7 +16,9 @@
  • Vorname: {{ user.first_name }}
  • Nachname: {{ user.last_name }}
  • Email: {{ user.email }}
    • -
  • Passwort: Nutzerpasswort zurücksetzen
    • +
  • Passwort: Nutzerpasswort + zurücksetzen
    • {#
  • Telefon: {{ user.phone }}
    • #} {#
  • Mobiltelefon: {{ user.mobile_phone }}
    • #}
  • Gruppen: @@ -31,6 +33,12 @@ Gruppen zuweisen
    • +
  • Zuletzt eingeloggt: + {% if user.last_login %} + {{ user.last_login.strftime('%d.%m.%Y') }} + {% else %} + + + {% endif %}