diff --git a/src/communication/models.py b/src/communication/models.py index c5d4985..04ac41a 100644 --- a/src/communication/models.py +++ b/src/communication/models.py @@ -28,7 +28,7 @@ class Message(Markdownizable): auto_now=True, verbose_name="Date of reading" ) title = models.CharField(max_length=255, verbose_name="Title") - body = models.TextField(null=True, blank=True, verbose_name="Message",) + body = models.TextField(null=True, blank=True, verbose_name="Message") @property def is_read(): diff --git a/src/communication/views.py b/src/communication/views.py index 481d06f..4fa015a 100644 --- a/src/communication/views.py +++ b/src/communication/views.py @@ -6,6 +6,7 @@ from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render, get_object_or_404 from django.views.decorators.http import require_http_methods from django.urls import reverse +from datetime import datetime from .forms import MessageForm from .models import Message @@ -64,8 +65,8 @@ def get_message_details(request, messageid): """Récupère les détails (l'affichage ?) d'un message. """ message = get_object_or_404(Message, pk=messageid) - if not message.is_read and message.recipient == request.user.id: - message.is_read = True + if not message.read_at and message.recipient == request.user.id: + message.read_at = datetime.now() message.save() context = {"message": message, "type": None} diff --git a/src/profile/urls.py b/src/profile/urls.py index 0bebf1e..7b825c0 100644 --- a/src/profile/urls.py +++ b/src/profile/urls.py @@ -6,6 +6,6 @@ from . import views profile_urlpatterns = [ - path(r"^lookup/$", views.user_lookup, name="user_lookup"), + path(r"lookup/", views.user_lookup, name="user_lookup"), path(r"edit//", views.profile_update, name="profile_update"), ] diff --git a/src/templates/message_create.html b/src/templates/message_create.html index f53b666..f15c2f0 100644 --- a/src/templates/message_create.html +++ b/src/templates/message_create.html @@ -16,26 +16,26 @@ {% csrf_token %} -
- +
+
- {{ form.reader }} - {{ form.reader_related }} - {% if form.reader.errors %} {% for error in form.reader.errors %}{{error}}{% endfor %}{% endif %} + {{ form.recipient }} + {{ form.recipient_related }} + {% if form.recipient.errors %} {% for error in form.recipient.errors %}{{error}}{% endfor %}{% endif %}
-
- +
+
- {{ form.message_title }} - {% if form.message_title.errors %} {% for error in form.message_title.errors %}{{error}}{% endfor %}{% endif %} + {{ form.title }} + {% if form.title.errors %} {% for error in form.title.errors %}{{error}}{% endfor %}{% endif %}
-
- +
+
- {{ form.message_body }} - {% if form.message_body.errors %} {% for error in form.message_body.errors %}{{error}}{% endfor %}{% endif %} + {{ form.body }} + {% if form.body.errors %} {% for error in form.body.errors %}{{error}}{% endfor %}{% endif %}
@@ -52,11 +52,11 @@