bug fix and migration to Django 3.9.5

This commit is contained in:
Trullemans Gregory 2021-05-09 19:28:35 +02:00
parent 7f768895a4
commit 0e5b9f53a4
9 changed files with 26 additions and 25 deletions

View File

@ -1,12 +1,11 @@
Django==3.0.3
pyaml==19.12.0
PyYAML==5.3
Markdown==3.2.1
reportlab==3.5.34
simplejson==3.17.0
Sphinx==2.4.1
django-extensions==2.2.8
djangorestframework==3.11.0
Django==3.2.2
django-extensions==3.1.3
djangorestframework==3.12.4
django-environ==0.4.5
pendulum==2.1.2
pyaml==20.4.0
PyYAML==5.4.1
Markdown==3.3.4
reportlab==3.5.67
simplejson==3.17.2
Sphinx==3.5.4

View File

@ -1,9 +1,9 @@
-r base.txt
flake8==3.7.9
coverage==5.0.3
django-spaghetti-and-meatballs==0.2.2
black==19.10b0
coverage==5.5
flake8==3.9.1
django-spaghetti-and-meatballs==0.4.2
docutils==0.16
pytest==5.3.5
pytest-django
black==19.10b0
pytest==6.2.4
pytest-django==4.2.0

View File

@ -1,4 +1,4 @@
-r dev.txt
mysqlclient==1.4.6
sqlparse==0.3.0
mysqlclient==2.0.3
sqlparse==0.4.1

View File

@ -12,7 +12,7 @@ from .models import Message
@login_required
def get_number_of_unread_messages(request):
def get_number_of_unread_message(request):
"""Récupère le nombre de messages non lus associés à l'utilisateur en session.
"""
return Message.objects.filter(recipient=request.user).filter(read_at__isnull=True).count()
@ -101,7 +101,7 @@ def compose_message(request):
if form.is_valid():
form.save()
return HttpResponseRedirect(reverse("message_sent"))
return HttpResponseRedirect(reverse("sent_messages"))
else:
print("Invalid form")
else:

View File

@ -128,3 +128,5 @@ MEDIA_ROOT = os.path.join(BASE_DIR, "media")
DEBUG_TOOLBAR_CONFIG = {
"JQUERY_URL": STATIC_URL + "js/jquery-2.1.4.min.js",
}
DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'

View File

@ -2,4 +2,4 @@ from django.apps import AppConfig
class ProfileConfig(AppConfig):
name = "Profile"
name = "profile"

View File

@ -142,10 +142,10 @@
<a href="{% url 'compose_message' %}" class="nav-item dropdown-item"><i class="tim-icons icon-pencil"></i> Compose message</a>
</li>
<li class="nav-link">
<a href="{% url 'message_received' %}" class="nav-item dropdown-item"><i class="tim-icons icon-email-85"></i> Received messages</a>
<a href="{% url 'received_messages' %}" class="nav-item dropdown-item"><i class="tim-icons icon-email-85"></i> Received messages</a>
</li>
<li class="nav-link">
<a href="{% url 'message_sent' %}" class="nav-item dropdown-item"><i class="tim-icons icon-send"></i> Sent messages</a>
<a href="{% url 'sent_messages' %}" class="nav-item dropdown-item"><i class="tim-icons icon-send"></i> Sent messages</a>
</li>
</ul>
</li>

View File

@ -25,7 +25,7 @@
</ul>
{% endif %}
{% if number_unreaded_message %}
You have <a href="{% url 'message_received' %}">{{ number_unreaded_message }}</a> unread messsage{% if number_unreaded_message > 1 %}s{% endif %}.
You have <a href="{% url 'received_messages' %}">{{ number_unreaded_message }}</a> unread messsage{% if number_unreaded_message > 1 %}s{% endif %}.
{% endif %}
</div>
</div>

View File

@ -13,7 +13,7 @@
</div>
<div class="card-footer row pt-0">
<div class="col-6">
<a {% if type == 'received' %}href="{% url 'message_received' %}{% else %}href="{% url 'message_sent' %}{% endif %}">
<a {% if type == 'received' %}href="{% url 'received_messages' %}{% else %}href="{% url 'sent_messages' %}{% endif %}">
<button type="submit" value="add" class="btn btn-icon btn-warning ">
<i class="tim-icons icon-double-left"></i>
</button>