diff --git a/requirements/base.txt b/requirements/base.txt index 04dcf83..6ae75b7 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -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 diff --git a/requirements/dev.txt b/requirements/dev.txt index 8cfcef7..47b1c24 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -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 \ No newline at end of file +pytest==6.2.4 +pytest-django==4.2.0 \ No newline at end of file diff --git a/requirements/with-mysql.txt b/requirements/with-mysql.txt index 7652074..0fdf042 100644 --- a/requirements/with-mysql.txt +++ b/requirements/with-mysql.txt @@ -1,4 +1,4 @@ -r dev.txt -mysqlclient==1.4.6 -sqlparse==0.3.0 +mysqlclient==2.0.3 +sqlparse==0.4.1 diff --git a/src/communication/views.py b/src/communication/views.py index 768f84d..6ccd97d 100644 --- a/src/communication/views.py +++ b/src/communication/views.py @@ -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: diff --git a/src/khana/settings.py b/src/khana/settings.py index 0bbe127..6f5d3e3 100644 --- a/src/khana/settings.py +++ b/src/khana/settings.py @@ -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' \ No newline at end of file diff --git a/src/profile/apps.py b/src/profile/apps.py index 442f64d..9c0b232 100644 --- a/src/profile/apps.py +++ b/src/profile/apps.py @@ -2,4 +2,4 @@ from django.apps import AppConfig class ProfileConfig(AppConfig): - name = "Profile" + name = "profile" diff --git a/src/templates/base.html b/src/templates/base.html index 8dd67ae..0b53ca0 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -142,10 +142,10 @@ Compose message diff --git a/src/templates/index.html b/src/templates/index.html index d4fd1d7..ead6882 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -25,7 +25,7 @@ {% endif %} {% if number_unreaded_message %} - You have {{ number_unreaded_message }} unread messsage{% if number_unreaded_message > 1 %}s{% endif %}. + You have {{ number_unreaded_message }} unread messsage{% if number_unreaded_message > 1 %}s{% endif %}. {% endif %} diff --git a/src/templates/message_details.html b/src/templates/message_details.html index aa2de8c..073473c 100644 --- a/src/templates/message_details.html +++ b/src/templates/message_details.html @@ -13,7 +13,7 @@