Fehlerbehandlung Gruppe und last_login

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():

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})
 

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