From 23852ce7c87ce64f544acb887bcd0efe237d1732 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Fri, 8 Jan 2021 10:29:28 +0100 Subject: [PATCH] Fehlerbehandlung Gruppe und last_login --- .../__pycache__/adm_tags.cpython-38.pyc | Bin 1687 -> 1731 bytes adm/templatetags/adm_tags.py | 5 ++++- adm/views.py | 10 ++++++---- dump.rdb | Bin 74135 -> 37880 bytes users/views.py | 11 ++++++----- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/adm/templatetags/__pycache__/adm_tags.cpython-38.pyc b/adm/templatetags/__pycache__/adm_tags.cpython-38.pyc index a85673ea751c81786dc2f14fe6c755cb5014d55a..926b2d5a8de95b9d0b036ed22d447962322ea391 100644 GIT binary patch delta 132 zcmbQvdzhCml$V!_0SLCJ{)p#d-N?tp;>!l)IsFUvXPI8MV%SQbq3;MJ|I!Tkj0qARKt+M*vlBqpvmO7 nlJOR6dQpC9!Q@yLJ2obu5(cKp%UN0&H8$(8PGMwbW?=*XNCFax diff --git a/adm/templatetags/adm_tags.py b/adm/templatetags/adm_tags.py index 9aabd28..f40c4de 100644 --- a/adm/templatetags/adm_tags.py +++ b/adm/templatetags/adm_tags.py @@ -35,7 +35,10 @@ def getlaststat(): # Gibt die AgencyGroup anhand einer Gruppe zurück @register.simple_tag def getAgencyGroupName(group): - return AgencyGroup.objects.get(group=group) + try: + return AgencyGroup.objects.get(group=group) + except: + return "Nicht gefunden" @register.simple_tag def loadAboCount(): diff --git a/adm/views.py b/adm/views.py index dcc6f2a..d4bfa0a 100644 --- a/adm/views.py +++ b/adm/views.py @@ -205,11 +205,13 @@ class AdmUserSingle(TemplateView): logdata_logins = [] for ele in logdata: + try: + datestring = json.loads(ele.changes)["last_login"][1] - datestring = json.loads(ele.changes)["last_login"][1] - - datestring = datestring.split(".")[0] - logdata_logins.append(datetime.strptime(datestring, '%Y-%m-%d %H:%M:%S')) + datestring = datestring.split(".")[0] + logdata_logins.append(datetime.strptime(datestring, '%Y-%m-%d %H:%M:%S')) + except: + pass context.update({'logdata' : logdata_logins}) diff --git a/dump.rdb b/dump.rdb index 10f0b79ff40096202ebb6978cea800c554eceb44..325a5c5622827a282c945b98b22b0b20dcf89758 100644 GIT binary patch delta 660 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