DigitaleAgentur___ALT
/
digitaleagenturnc
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Erste Runde Bugs

This commit is contained in:
holger.trampe 2020-10-25 14:44:15 +01:00
parent 725efc6560
commit e2064ba201
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
message/templates/message/message.html
View File

@ -145,7 +145,7 @@
success: function( data ) success: function( data )
{ {
$("#us_" + delmessid).remove(); $("#us_" + delmessid).remove();
$("#delMess").modal("toggle"); $("#delMess").modal("hide");
var newmesscount = $("#messcounter").html(); var newmesscount = $("#messcounter").html();
newmesscount = newmesscount.replace("(", ""); newmesscount = newmesscount.replace("(", "");
newmesscount = newmesscount.replace(")", ""); newmesscount = newmesscount.replace(")", "");

3
message/views.py
View File

@ -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) 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) 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): if(targetuser.usernotifications.message_received_mail):
username = targetuser.first_name + " " + targetuser.last_name username = targetuser.first_name + " " + targetuser.last_name
@ -84,7 +84,6 @@ def mainmessageview(request):
# Loading only user same agency # Loading only user same agency
# Change context and return for template-data # Change context and return for template-data
# # Get all Users of the Same Agency as logged user # # Get all Users of the Same Agency as logged user
return render (request, 'message/message.html', context) return render (request, 'message/message.html', context)
@login_required @login_required

2
notificsys/models.py
View File

@ -24,4 +24,4 @@ class UserNotification(models.Model):
# Eventuell automatisches Lösch-Datum # Eventuell automatisches Lösch-Datum
#willdeleted = models.DateTimeField(default=timezone.now()+timedelta(days=30)) #willdeleted = models.DateTimeField(default=timezone.now()+timedelta(days=30))
# Textcontent # Textcontent
notificationtext = models.CharField(max_length=200, blank=True) notificationtext = models.CharField(max_length=5000, blank=True)

2
standards/templates/standards/standards_single.html
View File

@ -229,7 +229,7 @@
{% if groupchecker %} {% if groupchecker %}
Name: <b>{{pass.name }}</b><br /> Name: <b>{{pass.name }}</b><br />
Benutzername: <b/>{{pass.agpass_username }}</b><br /> Benutzername: <b/>{{pass.agpass_username }}</b><br />
Passwort: <b/>{{pass.agpass_username }}</b><br /> Passwort: <b/>{{pass.compass }}</b><br />
{% else %} {% else %}
Sie dürfen keine Informationen dieses Passwortes einsehen. Sie dürfen keine Informationen dieses Passwortes einsehen.
{% endif %} {% endif %}