diff --git a/adm/templatetags/__pycache__/adm_tags.cpython-38.pyc b/adm/templatetags/__pycache__/adm_tags.cpython-38.pyc index a85673e..926b2d5 100644 Binary files a/adm/templatetags/__pycache__/adm_tags.cpython-38.pyc and b/adm/templatetags/__pycache__/adm_tags.cpython-38.pyc differ 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 10f0b79..325a5c5 100644 Binary files a/dump.rdb and b/dump.rdb differ diff --git a/users/views.py b/users/views.py index fd07314..2c53b4f 100644 --- a/users/views.py +++ b/users/views.py @@ -650,11 +650,12 @@ def showUserLog(request, pk): logdata_logins = [] for ele in logdata: - - datestring = json.loads(ele.changes)["last_login"][1] - - datestring = datestring.split(".")[0] - logdata_logins.append(datetime.strptime(datestring, '%Y-%m-%d %H:%M:%S')) + try: + datestring = json.loads(ele.changes)["last_login"][1] + datestring = datestring.split(".")[0] + logdata_logins.append(datetime.strptime(datestring, '%Y-%m-%d %H:%M:%S')) + except: + pass context = { 'logdata' : logdata_logins