From e2064ba201a922e6a43081019c02951fdb286ed6 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Sun, 25 Oct 2020 14:44:15 +0100 Subject: [PATCH] Erste Runde Bugs --- message/templates/message/message.html | 2 +- message/views.py | 3 +-- notificsys/models.py | 2 +- standards/templates/standards/standards_single.html | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/message/templates/message/message.html b/message/templates/message/message.html index 015823c..9e3e66e 100644 --- a/message/templates/message/message.html +++ b/message/templates/message/message.html @@ -145,7 +145,7 @@ success: function( data ) { $("#us_" + delmessid).remove(); - $("#delMess").modal("toggle"); + $("#delMess").modal("hide"); var newmesscount = $("#messcounter").html(); newmesscount = newmesscount.replace("(", ""); newmesscount = newmesscount.replace(")", ""); diff --git a/message/views.py b/message/views.py index 25fb657..816241f 100644 --- a/message/views.py +++ b/message/views.py @@ -35,7 +35,7 @@ def mainmessageview(request): message = Message.objects.create(target_user=targetuser, agency=request.user.profile.agency, content=messagecontent, created_by=request.user) targeturl = request.build_absolute_uri() + "sl/" + str(message.id) - notificationtext = "Sie haben eine neue Mitteilung erhalten: " + message.content + notificationtext = "Sie haben eine neue Mitteilung erhalten: " + message.content[:500] if(targetuser.usernotifications.message_received_mail): username = targetuser.first_name + " " + targetuser.last_name @@ -84,7 +84,6 @@ def mainmessageview(request): # Loading only user same agency # Change context and return for template-data # # Get all Users of the Same Agency as logged user - return render (request, 'message/message.html', context) @login_required diff --git a/notificsys/models.py b/notificsys/models.py index ce09657..0b4290e 100644 --- a/notificsys/models.py +++ b/notificsys/models.py @@ -24,4 +24,4 @@ class UserNotification(models.Model): # Eventuell automatisches Lösch-Datum #willdeleted = models.DateTimeField(default=timezone.now()+timedelta(days=30)) # Textcontent - notificationtext = models.CharField(max_length=200, blank=True) \ No newline at end of file + notificationtext = models.CharField(max_length=5000, blank=True) \ No newline at end of file diff --git a/standards/templates/standards/standards_single.html b/standards/templates/standards/standards_single.html index b0d821c..2618a36 100644 --- a/standards/templates/standards/standards_single.html +++ b/standards/templates/standards/standards_single.html @@ -229,7 +229,7 @@ {% if groupchecker %} Name: {{pass.name }}
Benutzername: {{pass.agpass_username }}
- Passwort: {{pass.agpass_username }}
+ Passwort: {{pass.compass }}
{% else %} Sie dürfen keine Informationen dieses Passwortes einsehen. {% endif %}