Merge pull request 'Thubrecht/daphne' (#815) from thubrecht/daphne into master

Reviewed-on: #815

.envrc

@@ -0,0 +1 @@
+use nix

.gitignore

@@ -5,6 +5,7 @@ cof/settings.py
 settings.py
 *~
 venv/
+.venv/
 .vagrant
 /src
 media/
@@ -18,4 +19,5 @@ media/
 .cache
 
 # VSCode
-.vscode/
+.vscode/
+.direnv

.gitlab-ci.yml

@@ -43,13 +43,21 @@ variables:
     # Keep this disabled for now, as it may kill GitLab...
     # coverage: '/TOTAL.*\s(\d+\.\d+)\%$/'
 
+kfettest:
+    stage: test
+    extends: .test_template
+    variables:
+        DJANGO_SETTINGS_MODULE: "gestioasso.settings.cof_prod"
+    script:
+        - coverage run manage.py test kfet
+
 coftest:
     stage: test
     extends: .test_template
     variables:
         DJANGO_SETTINGS_MODULE: "gestioasso.settings.cof_prod"
     script:
-        - coverage run manage.py test gestioncof bda kfet petitscours shared --parallel
+        - coverage run manage.py test gestioncof bda petitscours shared --parallel
 
 bdstest:
     stage: test

CHANGELOG.md

@@ -21,12 +21,87 @@ Liste des changements notables dans GestioCOF depuis la version 0.1 (septembre
 Uniquement un modèle simple de clubs avec des respos. Aucune gestion des
 adhérents ni des cotisations.
 
-## Version 0.10 - 18/04/2021
+## TODO Prod
 
-### TODO Prod
+- Lancer `python manage.py update_translation_fields` après la migration
+- Mettre à jour les units systemd `daphne.service` et `worker.service`
 
 - Créer un compte hCaptcha (https://www.hcaptcha.com/), au COF, et remplacer les secrets associés
 
+## Version ??? - ??/??/????
+
+## Version 0.15.1 - 15/06/2023
+
+### K-Fêt
+
+- Rattrape les erreurs d'envoi de mail de négatif
+- Utilise l'adresse chefs pour les envois de négatifs
+
+## Version 0.15 - 22/05/2023
+
+### K-Fêt
+
+- Rajoute un formulaire de contact
+- Rajoute un formulaire de demande de soirée
+- Désactive les mails d'envoi de négatifs sur les comptes gelés
+
+## Version 0.14 - 19/05/2023
+
+- Répare les dépendances en spécifiant toutes les versions
+
+### K-Fêt
+
+- Répare la gestion des changement d'heure via moment.js
+
+## Version 0.13 - 19/02/2023
+
+### K-Fêt
+
+- Rajoute la valeur des inventaires
+- Résout les problèmes de négatif ne disparaissant pas
+- Affiche son surnom s'il y en a un
+- Bugfixes
+
+## Version 0.12.1 - 03/10/2022
+
+### K-Fêt
+
+- Fixe un problème de rendu causé par l'agrandissement du menu
+
+- Mise à jour vers Channels 3.x et Django 3.2
+
+## Version 0.12 - 17/06/2022
+
+### K-Fêt
+
+- Ajoute une exception à la limite d'historique pour les comptes `LIQ` et `#13`
+- Répare le problème des étiquettes LIQ/Comptes K-Fêt inversées dans les stats des articles K-Fêt
+
+## Version 0.11 - 26/10/2021
+
+### COF
+
+- Répare un problème de rendu sur le wagtail du COF
+
+### K-Fêt
+
+- Ajoute de mails de rappels pour les comptes en négatif
+- La recherche de comptes sur K-Psul remarche normalement
+- Le pointeur de la souris change de forme quand on survole un item d'autocomplétion
+- Modification du gel de compte:
+    - on ne peut plus geler/dégeler son compte soi-même (il faut la permission "Gérer les permissions K-Fêt")
+    - on ne peut rien compter sur un compte gelé (aucune override possible), et les K-Fêteux·ses dont le compte est gelé perdent tout accès à K-Psul
+    - les comptes actuellement gelés (sur l'ancien système) sont dégelés automatiquement
+- Modification du fonctionnement des négatifs
+    - impossible d'avoir des négatifs inférieurs à `kfet_config.overdraft_amount`
+    - il n'y a plus de limite de temps sur les négatifs
+    - supression des autorisations de négatif
+    - il n'est plus possible de réinitialiser la durée d'un négatif en faisant puis en annulant une charge
+- La gestion des erreurs passe du client au serveur, ce qui permet d'avoir des messages plus explicites
+- La supression d'opérations anciennes est réparée
+
+## Version 0.10 - 18/04/2021
+
 ### K-Fêt
 
 - On fait sauter la limite qui empêchait de vendre plus de 24 unités d'un item à

bda/admin.py

@@ -211,7 +211,6 @@ class AttributionAdminForm(forms.ModelForm):
 
 
 class AttributionAdmin(ReadOnlyMixin, admin.ModelAdmin):
-
     list_display = ("id", "spectacle", "participant", "given", "paid")
     search_fields = (
         "spectacle__title",

bda/algorithm.py

@@ -2,7 +2,6 @@ import random
 
 
 class Algorithm(object):
-
     shows = None
     ranks = None
     origranks = None

bda/management/commands/loadbdadevdata.py

@@ -81,7 +81,7 @@ class Command(MyBaseCommand):
                 shows = random.sample(
                     list(tirage.spectacle_set.all()), tirage.spectacle_set.count() // 2
                 )
-                for (rank, show) in enumerate(shows):
+                for rank, show in enumerate(shows):
                     choices.append(
                         ChoixSpectacle(
                             participant=part,

bda/migrations/0001_initial.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]
 
     operations = [

bda/migrations/0002_add_tirage.py

@@ -35,7 +35,6 @@ def fill_tirage_fields(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("bda", "0001_initial")]
 
     operations = [

bda/migrations/0003_update_tirage_and_spectacle.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("bda", "0002_add_tirage")]
 
     operations = [

bda/migrations/0004_mails-rappel.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("bda", "0003_update_tirage_and_spectacle")]
 
     operations = [

bda/migrations/0005_encoding.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("bda", "0004_mails-rappel")]
 
     operations = [

bda/migrations/0006_add_tirage_switch.py

@@ -18,7 +18,6 @@ def forwards_func(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("bda", "0005_encoding")]
 
     operations = [

bda/migrations/0007_extends_spectacle.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("bda", "0006_add_tirage_switch")]
 
     operations = [

bda/migrations/0008_py3.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("bda", "0007_extends_spectacle")]
 
     operations = [

bda/migrations/0009_revente.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("bda", "0008_py3")]
 
     operations = [

bda/migrations/0010_spectaclerevente_shotgun.py

@@ -21,7 +21,6 @@ def forwards_func(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("bda", "0009_revente")]
 
     operations = [

bda/migrations/0011_tirage_appear_catalogue.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("bda", "0010_spectaclerevente_shotgun")]
 
     operations = [

bda/migrations/0012_notif_time.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("bda", "0011_tirage_appear_catalogue")]
 
     operations = [

bda/migrations/0012_swap_double_choice.py

@@ -13,7 +13,6 @@ def swap_double_choice(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("bda", "0011_tirage_appear_catalogue")]
 
     operations = [

bda/migrations/0013_merge_20180524_2123.py

@@ -6,7 +6,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("bda", "0012_notif_time"), ("bda", "0012_swap_double_choice")]
 
     operations = []

bda/migrations/0014_attribution_paid_field.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("bda", "0013_merge_20180524_2123")]
 
     operations = [

bda/migrations/0015_move_bda_payment.py

@@ -29,7 +29,6 @@ def set_participant_payment(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("bda", "0014_attribution_paid_field")]
 
     operations = [

bda/migrations/0016_delete_participant_paid.py

@@ -4,7 +4,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("bda", "0015_move_bda_payment")]
 
     operations = [

bda/migrations/0017_participant_accepte_charte.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("bda", "0016_delete_participant_paid")]
 
     operations = [

bda/migrations/0018_auto_20201021_1818.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("bda", "0017_participant_accepte_charte"),
     ]

bda/migrations/0019_auto_20220630_1245.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.13 on 2022-06-30 10:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bda", "0018_auto_20201021_1818"),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name="choixspectacle",
+            unique_together=set(),
+        ),
+        migrations.AddConstraint(
+            model_name="choixspectacle",
+            constraint=models.UniqueConstraint(
+                fields=("participant", "spectacle"), name="unique_participation"
+            ),
+        ),
+    ]

bda/models.py

@@ -253,7 +253,11 @@ class ChoixSpectacle(models.Model):
 
     class Meta:
         ordering = ("priority",)
-        unique_together = (("participant", "spectacle"),)
+        constraints = [
+            models.UniqueConstraint(
+                fields=["participant", "spectacle"], name="unique_participation"
+            )
+        ]
         verbose_name = "voeu"
         verbose_name_plural = "voeux"
 

bda/templates/bda-attrib.html

@@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block extra_head %}
 	<link type="text/css" rel="stylesheet" href="{% static "bda/css/bda.css" %}" />

bda/templates/bda/etat-places.html

@@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block realcontent %}
   <h2>État des inscriptions BdA</h2>

bda/templates/bda/inscription-tirage.html

@@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block extra_head %}
 <script type="text/javascript" src="{% static 'vendor/jquery/jquery-ui.min.js' %}" ></script>

bda/templates/bda/participants.html

@@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block realcontent %}
     <h2>{{ spectacle }}</h2>

bda/templates/bda/revente/confirm-shotgun.html

@@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles %}
+{% load static %}
 
 
 {%block realcontent %}

bda/templates/bda/revente/confirmed.html

@@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block realcontent %}
 <h2>Inscription à une revente</h2>

bda/templates/bda/revente/mail-success.html

@@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block realcontent %}
 

bda/templates/bda/revente/manage.html

@@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block realcontent %}
 

bda/templates/bda/revente/subscribe.html

@@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles%}
+{% load static %}
 
 {% block realcontent %}
   <h2>Inscriptions pour BdA-Revente</h2>

bda/templates/bda/revente/tirages.html

@@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block realcontent %}
 

bda/templates/spectacle_list.html

@@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block extra_head %}
     <link type="text/css" rel="stylesheet" href="{% static "bda/css/bda.css" %}" />

bda/tests/test_views.py

@@ -356,7 +356,9 @@ class TestReventeManageTest(TestCase):
 
     def test_can_get(self):
         client = Client()
-        client.force_login(self.user)
+        client.force_login(
+            self.user, backend="django.contrib.auth.backends.ModelBackend"
+        )
         r = client.get(self.url)
         self.assertEqual(r.status_code, 200)
 

bda/urls.py

@@ -1,74 +1,80 @@
-from django.conf.urls import url
+from django.urls import re_path
 
 from bda import views
 from bda.views import SpectacleListView
 from gestioncof.decorators import buro_required
 
 urlpatterns = [
-    url(
+    re_path(
         r"^inscription/(?P<tirage_id>\d+)$",
         views.inscription,
         name="bda-tirage-inscription",
     ),
-    url(r"^places/(?P<tirage_id>\d+)$", views.places, name="bda-places-attribuees"),
+    re_path(r"^places/(?P<tirage_id>\d+)$", views.places, name="bda-places-attribuees"),
-    url(r"^etat-places/(?P<tirage_id>\d+)$", views.etat_places, name="bda-etat-places"),
+    re_path(
-    url(r"^tirage/(?P<tirage_id>\d+)$", views.tirage, name="bda-tirage"),
+        r"^etat-places/(?P<tirage_id>\d+)$", views.etat_places, name="bda-etat-places"
-    url(
+    ),
+    re_path(r"^tirage/(?P<tirage_id>\d+)$", views.tirage, name="bda-tirage"),
+    re_path(
         r"^spectacles/(?P<tirage_id>\d+)$",
         buro_required(SpectacleListView.as_view()),
         name="bda-liste-spectacles",
     ),
-    url(
+    re_path(
         r"^spectacles/(?P<tirage_id>\d+)/(?P<spectacle_id>\d+)$",
         views.spectacle,
         name="bda-spectacle",
     ),
-    url(
+    re_path(
         r"^spectacles/unpaid/(?P<tirage_id>\d+)$",
         views.UnpaidParticipants.as_view(),
         name="bda-unpaid",
     ),
-    url(
+    re_path(
         r"^spectacles/autocomplete$",
         views.spectacle_autocomplete,
         name="bda-spectacle-autocomplete",
     ),
-    url(
+    re_path(
         r"^participants/autocomplete$",
         views.participant_autocomplete,
         name="bda-participant-autocomplete",
     ),
     # Urls BdA-Revente
-    url(
+    re_path(
         r"^revente/(?P<tirage_id>\d+)/manage$",
         views.revente_manage,
         name="bda-revente-manage",
     ),
-    url(
+    re_path(
         r"^revente/(?P<tirage_id>\d+)/subscribe$",
         views.revente_subscribe,
         name="bda-revente-subscribe",
     ),
-    url(
+    re_path(
         r"^revente/(?P<tirage_id>\d+)/tirages$",
         views.revente_tirages,
         name="bda-revente-tirages",
     ),
-    url(
+    re_path(
         r"^revente/(?P<spectacle_id>\d+)/buy$",
         views.revente_buy,
         name="bda-revente-buy",
     ),
-    url(
+    re_path(
         r"^revente/(?P<revente_id>\d+)/confirm$",
         views.revente_confirm,
         name="bda-revente-confirm",
     ),
-    url(
+    re_path(
         r"^revente/(?P<tirage_id>\d+)/shotgun$",
         views.revente_shotgun,
         name="bda-revente-shotgun",
     ),
-    url(r"^mails-rappel/(?P<spectacle_id>\d+)$", views.send_rappel, name="bda-rappels"),
+    re_path(
-    url(r"^catalogue/(?P<request_type>[a-z]+)$", views.catalogue, name="bda-catalogue"),
+        r"^mails-rappel/(?P<spectacle_id>\d+)$", views.send_rappel, name="bda-rappels"
+    ),
+    re_path(
+        r"^catalogue/(?P<request_type>[a-z]+)$", views.catalogue, name="bda-catalogue"
+    ),
 ]

bda/views.py

@@ -274,13 +274,13 @@ def do_tirage(tirage_elt, token):
     results = Algorithm(data["shows"], data["members"], choices)(token)
 
     # On compte les places attribuées et les déçus
-    for (_, members, losers) in results:
+    for _, members, losers in results:
         data["total_slots"] += len(members)
         data["total_losers"] += len(losers)
 
     # On calcule le déficit et les bénéfices pour le BdA
     # FIXME: le traitement de l'opéra est sale
-    for (show, members, _) in results:
+    for show, members, _ in results:
         deficit = (show.slots - len(members)) * show.price
         data["total_sold"] += show.slots * show.price
         if deficit >= 0:
@@ -293,8 +293,8 @@ def do_tirage(tirage_elt, token):
     # so assign a single object for each Participant id
     members_uniq = {}
     members2 = {}
-    for (show, members, _) in results:
+    for show, members, _ in results:
-        for (member, _, _, _) in members:
+        for member, _, _, _ in members:
             if member.id not in members_uniq:
                 members_uniq[member.id] = member
                 members2[member] = []

bds/__init__.py

@@ -1 +0,0 @@
-default_app_config = "bds.apps.BdsConfig"

bds/apps.py

@@ -1,5 +1,4 @@
-from django import apps as global_apps
+from django.apps import AppConfig, apps as global_apps
-from django.apps import AppConfig
 from django.db.models import Q
 from django.db.models.signals import post_migrate
 

bds/forms.py

@@ -36,4 +36,6 @@ class ProfileForm(forms.ModelForm):
     class Meta:
         model = BDSProfile
         exclude = ["user"]
-        widgets = {"birthdate": forms.DateInput(attrs={"type": "date"})}
+        widgets = {
+            "birthdate": forms.DateInput(attrs={"type": "date"}, format="%Y-%m-%d")
+        }

bds/migrations/0001_initial.py

@@ -8,7 +8,6 @@ import bds.models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]

bds/migrations/0002_bds_group.py

@@ -9,7 +9,6 @@ def create_bds_buro_group(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("bds", "0001_initial")]
 
     operations = [

bds/migrations/0003_staff_permission.py

@@ -4,7 +4,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("bds", "0002_bds_group"),
     ]

bds/migrations/0004_is_member_cotiz_type.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("bds", "0003_staff_permission"),
     ]

bds/migrations/0005_remove_bdsprofile_certificate_file.py

@@ -4,7 +4,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("bds", "0004_is_member_cotiz_type"),
     ]

bds/migrations/0006_bdsprofile_comments.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("bds", "0005_remove_bdsprofile_certificate_file"),
     ]

bds/models.py

@@ -3,6 +3,7 @@ from os.path import splitext
 
 from django.contrib.auth import get_user_model
 from django.db import models
+from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
 from shared.utils import choices_length
@@ -93,6 +94,16 @@ class BDSProfile(models.Model):
         ),
     )
 
+    @classmethod
+    def expired_members(cls):
+        now = timezone.now()
+        qs = cls.objects.filter(is_member=True)
+        if now.month > 1 and now.month < 7:
+            return qs.filter(cotisation_period="SE1")
+        elif now.month < 2 or now.month > 8:
+            return qs.none()
+        return qs
+
     class Meta:
         verbose_name = _("Profil BDS")
         verbose_name_plural = _("Profils BDS")

bds/templates/bds/base.html

@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% load bulma_utils %}
 
 <!DOCTYPE html>

bds/templates/bds/expired_members.html

@@ -0,0 +1,22 @@
+{% extends "bds/base.html" %}
+
+
+{% block content %}
+
+<h1 class="title">Liste des adhésions expirées</h1>
+
+{% if object_list %}
+<div class="content">
+    <ul>
+        {% for p in object_list %}
+        <li>{{ p.user.first_name }} {{ p.user.last_name }} ({{ p.user.username }}), {{ p.get_cotisation_period_display }}</li>
+        {% endfor %}
+    </ul>
+</div>
+
+<div class="buttons is-centered">
+  <a class="button is-danger" href="{% url 'bds:members.reset' %}">Réinitialiser les adhésions expirées</a>
+</div>
+{% endif %}
+
+{% endblock %}

bds/templates/bds/home.html

@@ -36,6 +36,8 @@
 
         <a class=button href="{% url 'bds:export.members' %}">Télécharger la liste des membres (CSV)</a>
 
+        <a class=button href="{% url 'bds:members.expired' %}">Liste des adhésions expirées ({{ nb_expired }})</a>
+
         <br>
         <br>
 

bds/templates/bds/user_update.html

@@ -5,100 +5,100 @@
 {% block content %}
 
 {% for form in forms.values %}
-  {% for error in form.non_field_errors %}
+{% for error in form.non_field_errors %}
-    <div class="notification is-danger">
+<div class="notification is-danger">
-      {{ error }}
+    {{ error }}
-    </div>
+</div>
-  {% endfor %}
+{% endfor %}
 {% endfor %}
 
 <h1 class="title">{% trans "Modification du profil " %}{{ view.user.username }}</h1>
 
 <div class="container">
-  <form method="post" action="" id="user-update-form">
+    <form method="post" action="" id="user-update-form">
-    {% csrf_token %}
+        {% csrf_token %}
 
-    {% for form in forms.values %}
+        {% for form in forms.values %}
-      {% include "bds/forms/form.html" with form=form errors=False %}
+        {% include "bds/forms/form.html" with form=form errors=False %}
-    {% endfor %}
+        {% endfor %}
-  </form>
+    </form>
 
-  <form method="post" action="{% url 'bds:user.delete' view.user.pk %}" id="user-delete-form">
+    <form method="post" action="{% url 'bds:user.delete' view.user.pk %}" id="user-delete-form">
-    {% csrf_token %}
+        {% csrf_token %}
-  </form>
+    </form>
-  
+
-  <div class="columns is-gapless mt-5">
+    <div class="columns is-gapless mt-5">
-    <div class="column is-5">
+        <div class="column is-5">
-      <button id="user-update-button" class="button is-fullwidth is-primary">Enregistrer</button>
+            <button id="user-update-button" class="button is-fullwidth is-primary">Enregistrer</button>
+        </div>
+        <div class="column is-2">
+        </div>
+        <div class="column is-5">
+            <button id="user-delete-button" class="button is-fullwidth is-danger">Supprimer</button>
+        </div>
     </div>
-    <div class="column is-2">
-    </div>
-    <div class="column is-5">
-      <button id="user-delete-button" class="button is-fullwidth is-danger">Supprimer</button>
-    </div>
-  </div>
 </div>
 
 <!-- Hidden by default -->
 <div id="confirm-delete-modal" class="modal">
-  <div class="modal-background"></div>
+    <div class="modal-background"></div>
-  <div class="modal-card">
+    <div class="modal-card">
-    <header class="modal-card-head">
+        <header class="modal-card-head">
-      <p class="modal-card-title">Confirmer la suppression</p>
+            <p class="modal-card-title">Confirmer la suppression</p>
-      <button id= "modal-close" class="delete" aria-label="close"></button>
+            <button id="modal-close" class="delete" aria-label="close"></button>
-    </header>
+        </header>
-    <section class="modal-card-body">
+        <section class="modal-card-body">
-      Voulez-vous réellement supprimer ce compte ? Attention, cette opération est irréversible !
+            Voulez-vous réellement supprimer ce compte ? Attention, cette opération est irréversible !
-    </section>
+        </section>
-    <footer class="modal-card-foot">
+        <footer class="modal-card-foot">
-      <button id="confirm-delete-button" class="button is-primary">Supprimer</button>
+            <button id="confirm-delete-button" class="button is-primary">Supprimer</button>
-      <button id="cancel-delete-button" class="button">Annuler</button>
+            <button id="cancel-delete-button" class="button">Annuler</button>
-    </footer>
+        </footer>
-  </div>
+    </div>
 </div>
 
 <script type="text/javascript">
-  $(document).ready(function() {
+    $(document).ready(function() {
-    "use strict";
+        "use strict";
 
-    // Adapted from https://bulma.io/lib/main.js
+        // Adapted from https://bulma.io/lib/main.js
-    function openModal(target) {
+        function openModal(target) {
-      $(document).addClass('is-clipped');
+            $(document).addClass('is-clipped');
-      $(`#${target}`).addClass('is-active');
+            $(`#${target}`).addClass('is-active');
-    }
+        }
 
-    function closeModals() {
+        function closeModals() {
-      $(document).removeClass('is-clipped');
+            $(document).removeClass('is-clipped');
-      $(".modal").removeClass('is-active');
+            $(".modal").removeClass('is-active');
-    }
+        }
 
-    // Si on clique sur enregistrer, ça marche
+        // Si on clique sur enregistrer, ça marche
-    $("#user-update-button").on("click", function() {
+        $("#user-update-button").on("click", function() {
-      $("#user-update-form").submit();
+            $("#user-update-form").submit();
-    })
+        })
+
+        // Si on clique sur supprimer, confirmation demandée
+        $("#user-delete-button").on("click", function() {
+            openModal("confirm-delete-modal");
+        });
+
+        $(".modal-background, #modal-close, #cancel-delete-button").on("click", closeModals);
+
+        $("#confirm-delete-button").on("click", function() {
+            $("#user-delete-form").submit();
+        });
+
+        $(document).on("keydown", function(e) {
+            if (e.key == "Escape") {
+                closeModals();
+            }
+
+            if (e.key == "Enter") {
+                $("#user-update-form").submit();
+            }
+        });
 
-    // Si on clique sur supprimer, confirmation demandée
-    $("#user-delete-button").on("click", function () {
-      openModal("confirm-delete-modal");
     });
-
-    $(".modal-background, #modal-close, #cancel-delete-button").on("click", closeModals);
-
-    $("#confirm-delete-button").on("click", function() {
-      $("#user-delete-form").submit();
-    });
-
-    $(document).on("keydown", function (e) {
-      if (e.key == "Escape") {
-        closeModals();
-      }
-
-      if (e.key == "Enter") {
-        $("#user-update-form").submit();
-      }
-    });
-
-  });
 </script>
 
 {% endblock %}

bds/tests/test_views.py

@@ -27,9 +27,11 @@ class TestHomeView(TestCase):
     def test_get(self, mock_messages):
         user = User.objects.create_user(username="random_user")
         give_bds_buro_permissions(user)
-        self.client.force_login(user)
+        self.client.force_login(
+            user, backend="django.contrib.auth.backends.ModelBackend"
+        )
         resp = self.client.get(reverse("bds:home"))
-        self.assertEquals(resp.status_code, 200)
+        self.assertEqual(resp.status_code, 200)
 
 
 class TestRegistrationView(TestCase):
@@ -44,14 +46,14 @@ class TestRegistrationView(TestCase):
         self.assertRedirects(resp, login_url(next=url))
 
         # Logged-in but unprivileged GET
-        client.force_login(user)
+        client.force_login(user, backend="django.contrib.auth.backends.ModelBackend")
         resp = client.get(url)
-        self.assertEquals(resp.status_code, 403)
+        self.assertEqual(resp.status_code, 403)
 
         # Burô user GET
         give_bds_buro_permissions(user)
         resp = client.get(url)
-        self.assertEquals(resp.status_code, 200)
+        self.assertEqual(resp.status_code, 200)
 
     @mock.patch("gestioncof.signals.messages")
     def test_get(self, mock_messages):
@@ -64,11 +66,11 @@ class TestRegistrationView(TestCase):
         self.assertRedirects(resp, login_url(next=url))
 
         # Logged-in but unprivileged GET
-        client.force_login(user)
+        client.force_login(user, backend="django.contrib.auth.backends.ModelBackend")
         resp = client.get(url)
-        self.assertEquals(resp.status_code, 403)
+        self.assertEqual(resp.status_code, 403)
 
         # Burô user GET
         give_bds_buro_permissions(user)
         resp = client.get(url)
-        self.assertEquals(resp.status_code, 200)
+        self.assertEqual(resp.status_code, 200)

bds/urls.py

@@ -15,4 +15,10 @@ urlpatterns = [
     ),
     path("user/delete/<int:pk>", views.UserDeleteView.as_view(), name="user.delete"),
     path("members", views.export_members, name="export.members"),
+    path(
+        "members/expired",
+        views.ResetMembershipListView.as_view(),
+        name="members.expired",
+    ),
+    path("members/reset", views.ResetMembershipView.as_view(), name="members.reset"),
 ]

bds/views.py

@@ -8,7 +8,7 @@ from django.http import HttpResponse
 from django.shortcuts import get_object_or_404
 from django.urls import reverse, reverse_lazy
 from django.utils.translation import gettext_lazy as _
-from django.views.generic import DeleteView, TemplateView
+from django.views.generic import DeleteView, ListView, RedirectView, TemplateView
 
 from bds.autocomplete import bds_search
 from bds.forms import ProfileForm, UserForm, UserFromClipperForm, UserFromScratchForm
@@ -30,6 +30,7 @@ class Home(StaffRequiredMixin, TemplateView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["member_count"] = BDSProfile.objects.filter(is_member=True).count()
+        context["nb_expired"] = BDSProfile.expired_members().count()
         return context
 
 
@@ -143,6 +144,28 @@ class UserDeleteView(StaffRequiredMixin, DeleteView):
         return super().delete(request, *args, **kwargs)
 
 
+class ResetMembershipListView(StaffRequiredMixin, ListView):
+    model = BDSProfile
+    template_name = "bds/expired_members.html"
+
+    def get_queryset(self):
+        return BDSProfile.expired_members()
+
+
+class ResetMembershipView(StaffRequiredMixin, RedirectView):
+    url = reverse_lazy("bds:members.expired")
+
+    def get(self, request, *args, **kwargs):
+        qs = BDSProfile.expired_members()
+        nb = qs.count()
+
+        qs.update(cotisation_period="NO", is_member=False, mails_bds=False)
+
+        messages.success(request, f"{nb} adhésions réinitialisées")
+
+        return super().get(request, *args, **kwargs)
+
+
 @permission_required("bds.is_team")
 def export_members(request):
     response = HttpResponse(content_type="text/csv")

clubs/migrations/0001_initial.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]

events/migrations/0001_event.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []

events/migrations/0002_event_subscribers.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ("events", "0001_event"),

events/migrations/0003_options_and_extra_fields.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ("events", "0002_event_subscribers"),

events/migrations/0004_unique_constraints.py

@@ -5,7 +5,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ("events", "0003_options_and_extra_fields"),

events/migrations/0005_auto_20220630_1239.py

@@ -0,0 +1,63 @@
+# Generated by Django 3.2.13 on 2022-06-30 10:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("events", "0004_unique_constraints"),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name="extrafield",
+            unique_together=set(),
+        ),
+        migrations.AlterUniqueTogether(
+            name="extrafieldcontent",
+            unique_together=set(),
+        ),
+        migrations.AlterUniqueTogether(
+            name="option",
+            unique_together=set(),
+        ),
+        migrations.AlterUniqueTogether(
+            name="optionchoice",
+            unique_together=set(),
+        ),
+        migrations.AlterUniqueTogether(
+            name="registration",
+            unique_together=set(),
+        ),
+        migrations.AddConstraint(
+            model_name="extrafield",
+            constraint=models.UniqueConstraint(
+                fields=("event", "name"), name="unique_extra_field"
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name="extrafieldcontent",
+            constraint=models.UniqueConstraint(
+                fields=("field", "registration"), name="unique_extra_field_content"
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name="option",
+            constraint=models.UniqueConstraint(
+                fields=("event", "name"), name="unique_event_option"
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name="optionchoice",
+            constraint=models.UniqueConstraint(
+                fields=("option", "choice"), name="unique_option_choice"
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name="registration",
+            constraint=models.UniqueConstraint(
+                fields=("event", "user"), name="unique_registration"
+            ),
+        ),
+    ]

events/models.py

@@ -72,9 +72,13 @@ class Option(models.Model):
     multi_choices = models.BooleanField(_("choix multiples"), default=False)
 
     class Meta:
+        constraints = [
+            models.UniqueConstraint(
+                fields=["event", "name"], name="unique_event_option"
+            )
+        ]
         verbose_name = _("option d'événement")
         verbose_name_plural = _("options d'événement")
-        unique_together = [["event", "name"]]
 
     def __str__(self):
         return self.name
@@ -87,9 +91,13 @@ class OptionChoice(models.Model):
     choice = models.CharField(_("choix"), max_length=200)
 
     class Meta:
+        constraints = [
+            models.UniqueConstraint(
+                fields=["option", "choice"], name="unique_option_choice"
+            )
+        ]
         verbose_name = _("choix d'option d'événement")
         verbose_name_plural = _("choix d'option d'événement")
-        unique_together = [["option", "choice"]]
 
     def __str__(self):
         return self.choice
@@ -118,7 +126,9 @@ class ExtraField(models.Model):
     field_type = models.CharField(_("type de champ"), max_length=9, choices=FIELD_TYPE)
 
     class Meta:
-        unique_together = [["event", "name"]]
+        constraints = [
+            models.UniqueConstraint(fields=["event", "name"], name="unique_extra_field")
+        ]
 
 
 class ExtraFieldContent(models.Model):
@@ -137,9 +147,13 @@ class ExtraFieldContent(models.Model):
             )
 
     class Meta:
+        constraints = [
+            models.UniqueConstraint(
+                fields=["field", "registration"], name="unique_extra_field_content"
+            )
+        ]
         verbose_name = _("contenu d'un champ événement supplémentaire")
         verbose_name_plural = _("contenus d'un champ événement supplémentaire")
-        unique_together = [["field", "registration"]]
 
     def __str__(self):
         max_length = 50
@@ -163,9 +177,13 @@ class Registration(models.Model):
             )
 
     class Meta:
+        constraints = [
+            models.UniqueConstraint(
+                fields=["event", "user"], name="unique_registration"
+            )
+        ]
         verbose_name = _("inscription à un événement")
         verbose_name_plural = _("inscriptions à un événement")
-        unique_together = [["event", "user"]]
 
     def __str__(self):
         return "inscription de {} à {}".format(self.user, self.event)

events/tests/test_views.py

@@ -54,7 +54,9 @@ class CSVExportAccessTest(MessagePatch, TestCase):
 
     def test_get(self):
         client = Client()
-        client.force_login(self.staff)
+        client.force_login(
+            self.staff, backend="django.contrib.auth.backends.ModelBackend"
+        )
         r = client.get(self.url)
         self.assertEqual(r.status_code, 200)
 
@@ -66,7 +68,7 @@ class CSVExportAccessTest(MessagePatch, TestCase):
 
     def test_unauthorised(self):
         client = Client()
-        client.force_login(self.u1)
+        client.force_login(self.u1, backend="django.contrib.auth.backends.ModelBackend")
         r = client.get(self.url)
         self.assertEqual(r.status_code, 403)
 
@@ -86,7 +88,9 @@ class CSVExportContentTest(MessagePatch, CSVResponseMixin, TestCase):
         )
         self.staff = make_staff_user("staff")
         self.client = Client()
-        self.client.force_login(self.staff)
+        self.client.force_login(
+            self.staff, backend="django.contrib.auth.backends.ModelBackend"
+        )
 
     def test_simple_event(self):
         self.event.subscribers.set([self.u1, self.u2])

gestioasso/asgi.py

@@ -1,8 +1,15 @@
+"""
+ASGI entrypoint. Configures Django and then runs the application
+defined in the ASGI_APPLICATION setting.
+"""
+
 import os
 
-from channels.asgi import get_channel_layer
+import django
+from channels.routing import get_default_application
 
 if "DJANGO_SETTINGS_MODULE" not in os.environ:
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "gestioasso.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "gestioasso.settings.local")
 
-channel_layer = get_channel_layer()
+django.setup()
+application = get_default_application()

gestioasso/routing.py

@@ -1,3 +1,20 @@
-from channels.routing import include
+from channels.auth import AuthMiddlewareStack
+from channels.routing import ProtocolTypeRouter, URLRouter
+from django.core.asgi import get_asgi_application
+from django.urls import path
 
-routing = [include("kfet.routing.routing", path=r"^/ws/k-fet")]
+from kfet.routing import KFRouter
+
+application = ProtocolTypeRouter(
+    {
+        # WebSocket chat handler
+        "websocket": AuthMiddlewareStack(
+            URLRouter(
+                [
+                    path("ws/k-fet", KFRouter),
+                ]
+            )
+        ),
+        "http": get_asgi_application(),
+    }
+)

gestioasso/settings/cof_prod.py

@@ -7,6 +7,8 @@ Surcharge les settings définis dans common.py
 import os
 from datetime import timedelta
 
+from django.utils import timezone
+
 from .common import *  # NOQA
 from .common import (
     AUTHENTICATION_BACKENDS,
@@ -83,7 +85,6 @@ MIDDLEWARE = (
     + MIDDLEWARE
     + [
         "djconfig.middleware.DjConfigMiddleware",
-        "wagtail.core.middleware.SiteMiddleware",
         "wagtail.contrib.redirects.middleware.RedirectMiddleware",
     ]
 )
@@ -107,15 +108,23 @@ MEDIA_URL = "/gestion/media/"
 CORS_ORIGIN_WHITELIST = ("bda.ens.fr", "www.bda.ens.fr" "cof.ens.fr", "www.cof.ens.fr")
 
 
+ASGI_APPLICATION = "gestioasso.routing.application"
+
 # ---
 # Auth-related stuff
 # ---
 
-AUTHENTICATION_BACKENDS += [
+AUTHENTICATION_BACKENDS = (
-    "gestioncof.shared.COFCASBackend",
+    [
-    "kfet.auth.backends.GenericBackend",
+        # Must be in first
-]
+        "kfet.auth.backends.BlockFrozenAccountBackend"
-
+    ]
+    + AUTHENTICATION_BACKENDS
+    + [
+        "gestioncof.shared.COFCASBackend",
+        "kfet.auth.backends.GenericBackend",
+    ]
+)
 LOGIN_URL = "cof-login"
 LOGIN_REDIRECT_URL = "home"
 
@@ -139,7 +148,7 @@ CACHES = {
 
 CHANNEL_LAYERS = {
     "default": {
-        "BACKEND": "asgi_redis.RedisChannelLayer",
+        "BACKEND": "shared.channels.ChannelLayer",
         "CONFIG": {
             "hosts": [
                 (
@@ -152,11 +161,9 @@ CHANNEL_LAYERS = {
                 )
             ]
         },
-        "ROUTING": "gestioasso.routing.routing",
     }
 }
 
-
 # ---
 # reCAPTCHA settings
 # https://github.com/praekelt/django-recaptcha
@@ -198,6 +205,10 @@ MAIL_DATA = {
         "REPLYTO": "cof@ens.fr",
     },
     "rappels": {"FROM": "Le BdA <bda@ens.fr>", "REPLYTO": "Le BdA <bda@ens.fr>"},
+    "kfet": {
+        "FROM": "La K-Fêt <chefs-k-fet@ens.fr>",
+        "REPLYTO": "La K-Fêt <chefs-k-fet@ens.fr>",
+    },
     "revente": {
         "FROM": "BdA-Revente <bda-revente@ens.fr>",
         "REPLYTO": "BdA-Revente <bda-revente@ens.fr>",
@@ -215,3 +226,8 @@ KFET_HISTORY_DATE_LIMIT = timedelta(days=7)
 # Limite plus longue pour les chefs/trez
 # (qui ont la permission kfet.access_old_history)
 KFET_HISTORY_LONG_DATE_LIMIT = timedelta(days=30)
+
+# These accounts don't represent actual people and can be freely accessed
+# Identification based on trigrammes
+KFET_HISTORY_NO_DATE_LIMIT_TRIGRAMMES = ["LIQ", "#13"]
+KFET_HISTORY_NO_DATE_LIMIT = timezone.datetime(1794, 10, 30)  # AKA the distant past

gestioasso/settings/common.py

@@ -101,7 +101,7 @@ TEMPLATES = [
 
 DATABASES = {
     "default": {
-        "ENGINE": "django.db.backends.postgresql_psycopg2",
+        "ENGINE": "django.db.backends.postgresql",
         "NAME": DBNAME,
         "USER": DBUSER,
         "PASSWORD": DBPASSWD,
@@ -111,6 +111,7 @@ DATABASES = {
 
 SITE_ID = 1
 
+DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
 
 # ---
 # Internationalization

gestioasso/settings/local.py

@@ -47,8 +47,7 @@ CACHES = {"default": {"BACKEND": "django.core.cache.backends.locmem.LocMemCache"
 # Use the default in memory asgi backend for local development
 CHANNEL_LAYERS = {
     "default": {
-        "BACKEND": "asgiref.inmemory.ChannelLayer",
+        "BACKEND": "channels.layers.InMemoryChannelLayer",
-        "ROUTING": "gestioasso.routing.routing",
     }
 }
 

gestioasso/urls.py

@@ -35,7 +35,7 @@ app_dict = {
     "events": "gestion/event_v2/",  # the events module is still experimental !
     "authens": "gestion/authens/",
 }
-for (app_name, url_prefix) in app_dict.items():
+for app_name, url_prefix in app_dict.items():
     if app_name in settings.INSTALLED_APPS:
         urlpatterns += [path(url_prefix, include("{}.urls".format(app_name)))]
 

gestioncof/__init__.py

@@ -1 +0,0 @@
-default_app_config = "gestioncof.apps.GestioncofConfig"

gestioncof/admin.py

@@ -6,7 +6,7 @@ from django.contrib.auth.models import Group, Permission, User
 from django.db.models import Q
 from django.urls import reverse
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from gestioncof.models import (
     Club,

gestioncof/cms/__init__.py

@@ -1 +0,0 @@
-default_app_config = "gestioncof.cms.apps.COFCMSAppConfig"

gestioncof/cms/migrations/0001_initial.py

@@ -13,7 +13,6 @@ import gestioncof.cms.models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [

gestioncof/cms/migrations/0002_auto_20190523_1521.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("cofcms", "0001_initial")]
 
     operations = [

gestioncof/cms/migrations/0003_directory_entry_optional_links.py

@@ -6,7 +6,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("cofcms", "0002_auto_20190523_1521"),
     ]

gestioncof/cms/migrations/0004_auto_20200829_2314.py

@@ -6,7 +6,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("cofcms", "0003_directory_entry_optional_links"),
     ]

gestioncof/cms/templates/cofcms/base.html

@@ -16,7 +16,7 @@
         <link rel="stylesheet" type="text/css" href="{% static "fonts/SourceSansPro/sourceSansPro.css" %}"/>
         <link rel="stylesheet" type="text/css" href="{% static "cofcms/css/screen.css" %}"/>
         {% block extra_head %}{% endblock %}
-        
+
         <meta name="viewport" content="width=device-width, initial-scale=1.0; minimum-scale=1.0;">
     </head>
 
@@ -32,27 +32,27 @@
             <section class="bottom-menu">
                 <nav>
                     {% flat_menu "cof-nav-int" template="cofcms/base_nav.html" apply_active_classes=True %}
-                    
-			        {% get_current_language as curlang %}
 
-			        <div class="lang-select">
+                    {% get_current_language as curlang %}
+
+                    <div class="lang-select">
                         {% if curlang == 'en' %}
-			                {% language 'fr' %}
+                            {% language 'fr' %}
-			                <a href="{% pageurl self %}" title="Français"><img src="{% static "cofcms/images/fr.png" %}"></a>
+                            <a href="{% pageurl self %}" title="Français"><img src="{% static "cofcms/images/fr.png" %}"></a>
-			                {% endlanguage %}
+                            {% endlanguage %}
                         {% else %}
-			                {% language 'en' %}
+                            {% language 'en' %}
-			                <a href="{% pageurl self %}" title="English"><img src="{% static "cofcms/images/en.png" %}"></a>
+                            <a href="{% pageurl self %}" title="English"><img src="{% static "cofcms/images/en.png" %}"></a>
                             {% endlanguage %}
                         {% endif %}
-			        </div>
+                    </div>
                 </nav>
             </section>
         </header>
 
         <div class="container">
             {% block superaside %}{% endblock %}
-            
+
             <div class="content">
                 {% block content %}{% endblock %}
             </div>

gestioncof/cms/templates/cofcms/cof_actu_index_page.html

@@ -17,17 +17,17 @@
 {% block content %}
     <section class="intro">
         <h1>{{ page.title }}</h1>
-        <div>{{ page.introduction|safe }}</div>
+        <div>{{ page.introduction|richtext }}</div>
     </section>
 
     <section class="actulist">
         {% if actus.has_previous %}
-	        <a class="block prev-actus" href="?page={{ actus.previous_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus récentes" %}</a>
+            <a class="block prev-actus" href="?page={{ actus.previous_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus récentes" %}</a>
-	    {% endif %}
+        {% endif %}
         {% if actus.has_next %}
-	        <a class="block next-actus" href="?page={{ actus.next_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus anciennes" %}</a>
+            <a class="block next-actus" href="?page={{ actus.next_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus anciennes" %}</a>
-	    {% endif %}
+        {% endif %}
-        
+
         {% for actu in page.actus %}
             <article class="actu">
                 <div class="actu-image" {% if actu.image %}{% image actu.image fill-400x200 as img %}style="background-image:url('{{ img.url }}');"{% endif %}></div>
@@ -36,7 +36,7 @@
                     {% if actu.is_event %}
                         <p><span class="actu-dates">{{ actu|dates|capfirst }}</span><br />{{ actu.chapo }}</p>
                     {% else %}
-                        {{ actu.body|safe|truncatewords_html:15 }}
+                        {{ actu.body|richtext|truncatewords_html:15 }}
                     {% endif %}
                     <a href="{% pageurl actu %}">{% trans "Lire plus" %} &gt;</a>
                 </div>
@@ -44,10 +44,10 @@
         {% endfor %}
 
         {% if actus.has_previous %}
-	        <a class="block prev-actus" href="?page={{ actus.previous_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus récentes" %}</a>
+            <a class="block prev-actus" href="?page={{ actus.previous_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus récentes" %}</a>
-	    {% endif %}
+        {% endif %}
         {% if actus.has_next %}
-	        <a class="block next-actus" href="?page={{ actus.next_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus anciennes" %}</a>
+            <a class="block next-actus" href="?page={{ actus.next_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus anciennes" %}</a>
-	    {% endif %}
+        {% endif %}
     </section>
 {% endblock %}

gestioncof/cms/templates/cofcms/cof_actu_page.html

@@ -1,5 +1,5 @@
 {% extends "cofcms/base.html" %}
-{% load wagtailimages_tags cofcms_tags i18n %}
+{% load wagtailcore_tags wagtailimages_tags cofcms_tags i18n %}
 
 {% block content %}
     <section class="intro">
@@ -11,7 +11,7 @@
     <section class="pagecontent">
         <div class="image">{% image page.image width-700 %}</div>
         <article>
-            {{ page.body|safe }}
+            {{ page.body|richtext }}
         </article>
     </section>
 {% endblock %}

gestioncof/cms/templates/cofcms/cof_directory_page.html

@@ -1,5 +1,5 @@
 {% extends "cofcms/base_aside.html" %}
-{% load wagtailimages_tags cofcms_tags static i18n %}
+{% load wagtailcore_tags wagtailimages_tags cofcms_tags static i18n %}
 
 {% block extra_head %}
     {{ block.super }}
@@ -18,7 +18,7 @@
 {% block content %}
     <section class="intro">
         <h1>{{ page.title }}</h1>
-        <div>{{ page.introduction|safe }}</div>
+        <div>{{ page.introduction|richtext }}</div>
     </section>
 
     <section class="directory">
@@ -28,7 +28,7 @@
                     <div class="entry-image">{% image entry.image width-150 class="entry-img" %}</div>
                 {% endif %}
                 <h2>{{ entry.title }}</h2>
-                <div class="desc">{{ entry.body|safe }}</div>
+                <div class="desc">{{ entry.body|richtext }}</div>
                 {% if entry.links %}
                     <ul class="links">
                         {% for block in entry.links %}

gestioncof/cms/templates/cofcms/cof_page.html

@@ -1,10 +1,10 @@
 {% extends "cofcms/base.html" %}
-{% load wagtailimages_tags cofcms_tags %}
+{% load wagtailcore_tags wagtailimages_tags cofcms_tags %}
 
 {% block content %}
     <section class="intro">
         <h1>{{ page.title }}</h1>
-        <div>{{ page.introduction|safe }}</div>
+        <div>{{ page.introduction|richtext }}</div>
     </section>
 
     <section class="pagecontent">
@@ -13,7 +13,7 @@
                 <h2>{{ block.value }}</h2>
             {% elif block.block_type == "paragraph" %}
                 <article class="paragraph">
-                    {{ block.value|safe }}
+                    {{ block.value|richtext }}
                 </article>
             {% elif block.block_type == "image" %}
                 <div class="image">

gestioncof/cms/templates/cofcms/cof_root_page.html

@@ -18,7 +18,7 @@
 {% block content %}
     <section class="intro">
         <h1>{{ page.title }}</h1>
-        <div>{{ page.introduction|safe }}</div>
+        <div>{{ page.introduction|richtext }}</div>
     </section>
 
     <section class="actuhome">
@@ -31,7 +31,7 @@
                     {% if actu.is_event %}
                         <span class="actu-minical">{% mini_calendar actu %}</span><span class="actu-dates">{{ actu|dates }}</span>
                     {% else %}
-                        {{ actu.body|safe|truncatewords_html:10 }}
+                        {{ actu.body|richtext|truncatewords_html:10 }}
                     {% endif %}
                 </div>
                 <a href="{% pageurl actu %}" class="actu-overlay"></a>

gestioncof/cms/templatetags/cofcms_tags.py

@@ -2,7 +2,7 @@ from datetime import date, timedelta
 
 from django import template
 from django.utils import formats, timezone
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from ..models import COFActuPage, COFRootPage
 

gestioncof/forms.py

@@ -3,7 +3,7 @@ from django.contrib.auth import get_user_model
 from django.contrib.auth.forms import AuthenticationForm
 from django.forms.formsets import BaseFormSet, formset_factory
 from django.forms.widgets import CheckboxSelectMultiple, RadioSelect
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from djconfig.forms import ConfigForm
 
 from bda.models import Spectacle
@@ -276,7 +276,9 @@ class RegistrationProfileForm(forms.ModelForm):
         self.fields["mailing_bda_revente"].initial = True
         self.fields["mailing_unernestaparis"].initial = True
 
-        self.fields.keyOrder = [
+    class Meta:
+        model = CofProfile
+        fields = [
             "login_clipper",
             "phone",
             "occupation",
@@ -290,22 +292,6 @@ class RegistrationProfileForm(forms.ModelForm):
             "comments",
         ]
 
-    class Meta:
-        model = CofProfile
-        fields = (
-            "login_clipper",
-            "phone",
-            "occupation",
-            "departement",
-            "is_cof",
-            "type_cotiz",
-            "mailing_cof",
-            "mailing_bda",
-            "mailing_bda_revente",
-            "mailing_unernestaparis",
-            "comments",
-        )
-
 
 STATUS_CHOICES = (
     ("no", "Non"),

gestioncof/migrations/0001_initial.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]
 
     operations = [

gestioncof/migrations/0002_enable_unprocessed_demandes.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("gestioncof", "0001_initial")]
 
     operations = [

gestioncof/migrations/0003_event_image.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("gestioncof", "0002_enable_unprocessed_demandes")]
 
     operations = [

gestioncof/migrations/0004_registration_mail.py

@@ -25,7 +25,6 @@ def create_mail(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("gestioncof", "0003_event_image")]
 
     operations = [

gestioncof/migrations/0005_encoding.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("gestioncof", "0004_registration_mail")]
 
     operations = [

gestioncof/migrations/0006_add_calendar.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("bda", "0004_mails-rappel"),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),

gestioncof/migrations/0007_alter_club.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("gestioncof", "0006_add_calendar")]
 
     operations = [

gestioncof/migrations/0008_py3.py

@@ -10,7 +10,6 @@ def forwards(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("gestioncof", "0007_alter_club")]
 
     operations = [

gestioncof/migrations/0009_delete_clipper.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("gestioncof", "0008_py3")]
 
     operations = [migrations.DeleteModel(name="Clipper")]

gestioncof/migrations/0010_delete_custommail.py

@@ -4,7 +4,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("gestioncof", "0009_delete_clipper")]
 
     operations = [migrations.DeleteModel(name="CustomMail")]

gestioncof/migrations/0011_longer_clippers.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("gestioncof", "0010_delete_custommail")]
 
     operations = [

gestioncof/migrations/0011_remove_cofprofile_num.py

@@ -5,7 +5,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("gestioncof", "0010_delete_custommail")]
 
     operations = [migrations.RemoveField(model_name="cofprofile", name="num")]