Ajoute get_queryset dans ModelSearch

Quand on utilise les vues d'auto-complétion, on a la possibilité de configurer des filtres avec `get_queryset_filter`, mais pas d'autres transformations sur le queryset. Notamment, cela signifie que pour les vues qui utilisent des `ForeignKey`, on ne peut pas spécifier de `select_related` pour éviter des requêtes inutiles et répétées lors du rendering des vues. Ce patch ajoute une méthode `get_queryset`, en suivant la convention habituelle de Django, permettant cette configuration, et l'utilise pour appeler `select_related` de façon appropriée dans les vues qui en bénéficient. À priori, cela devrait permettre de compenser la potentielle perte de performance de !469, qui a supprimé les `select_related` lors de la sélection des participants.
2020-10-23 22:37:03 +02:00
267 changed files with 1632 additions and 3543 deletions
--- a/.envrc
+++ b/.envrc
@ -1 +0,0 @@
-use nix
--- a/.gitignore
+++ b/.gitignore
@ -5,7 +5,6 @@ cof/settings.py
 settings.py
 *~
 venv/
-.venv/
 .vagrant
 /src
 media/
@ -19,5 +18,4 @@ media/
 .cache

 # VSCode
-.vscode/
-.direnv
+.vscode/
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -17,15 +17,12 @@ variables:
    # psql password authentication
    PGPASSWORD: $POSTGRES_PASSWORD

-    # apps to check migrations for
-    MIGRATION_APPS: "bda bds cofcms clubs events gestioncof kfet kfetauth kfetcms open petitscours shared"
-
 .test_template:
    before_script:
        - mkdir -p vendor/{pip,apt}
        - apt-get update -q && apt-get -o dir::cache::archives="vendor/apt" install -yqq postgresql-client libldap2-dev libsasl2-dev
-        - sed -E 's/^REDIS_HOST.*/REDIS_HOST = "redis"/' gestioasso/settings/secret_example.py > gestioasso/settings/secret.py
-        - sed -i.bak -E 's;^REDIS_PASSWD = .*$;REDIS_PASSWD = "";' gestioasso/settings/secret.py
+        - sed -E 's/^REDIS_HOST.*/REDIS_HOST = "redis"/' cof/settings/secret_example.py > cof/settings/secret.py
+        - sed -i.bak -E 's;^REDIS_PASSWD = .*$;REDIS_PASSWD = "";' cof/settings/secret.py
        # Remove the old test database if it has not been done yet
        - psql --username=$POSTGRES_USER --host=$DBHOST -c "DROP DATABASE IF EXISTS test_$POSTGRES_DB"
        - pip install --upgrade -r requirements-prod.txt coverage tblib
@ -47,7 +44,7 @@ coftest:
    stage: test
    extends: .test_template
    variables:
-        DJANGO_SETTINGS_MODULE: "gestioasso.settings.cof_prod"
+        DJANGO_SETTINGS_MODULE: "cof.settings.cof_prod"
    script:
        - coverage run manage.py test gestioncof bda kfet petitscours shared --parallel

@ -55,7 +52,7 @@ bdstest:
    stage: test
    extends: .test_template
    variables:
-        DJANGO_SETTINGS_MODULE: "gestioasso.settings.bds_prod"
+        DJANGO_SETTINGS_MODULE: "cof.settings.bds_prod"
    script:
        - coverage run manage.py test bds clubs events --parallel

@ -68,7 +65,7 @@ linters:
        - black --check .
        - isort --check --diff .
        # Print errors only
-        - flake8 --exit-zero bda bds clubs gestioasso events gestioncof kfet petitscours provisioning shared
+        - flake8 --exit-zero bda bds clubs cof events gestioncof kfet petitscours provisioning shared
    cache:
        key: linters
        paths:
@ -78,14 +75,14 @@ linters:
 migration_checks:
    stage: test
    variables:
-        DJANGO_SETTINGS_MODULE: "gestioasso.settings.local"
+        DJANGO_SETTINGS_MODULE: "cof.settings.local"
    before_script:
        - mkdir -p vendor/{pip,apt}
        - apt-get update -q && apt-get -o dir::cache::archives="vendor/apt" install -yqq postgresql-client libldap2-dev libsasl2-dev
-        - cp gestioasso/settings/secret_example.py gestioasso/settings/secret.py
+        - cp cof/settings/secret_example.py cof/settings/secret.py
        - pip install --upgrade -r requirements-devel.txt
        - python --version
-    script: python manage.py makemigrations --dry-run --check $MIGRATION_APPS
+    script: python manage.py makemigrations --dry-run --check
    services:
        # this should not be necessary…
        - postgres:11.7
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -21,132 +21,13 @@ 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.

-## TODO Prod
-
- 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
-
-## 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 à
-  la fois.
- L'interface indique plus clairement quand on fait une erreur en modifiant un
-  compte.
- On supprime la fonction "décalage de balance".
- L'accès à l'historique est maintenant limité à 7 jours pour raison de
-  confidentialité. Les chefs/trez peuvent disposer d'une permission
-  supplémentaire pour accéder à jusqu'à 30 jours en cas de problème de compta.
-  L'accès à son historique personnel n'est pas limité. Les durées sont
-  configurables dans `settings/cof_prod.py`.
-
-### COF
-
- Le Captcha sur la page de demande de petits cours utilise maintenant hCaptcha
-  au lieu de ReCaptcha, pour mieux respecter la vie privée des utilisateur·ices
-
-## Version 0.9 - 06/02/2020
-
-### COF / BdA
-
- Le COF peut remettre à zéro la liste de ses adhérents en août (sans passer par
-  KDE).
- La page d'accueil affiche la date de fermeture des tirages BdA.
- On peut revendre une place dès qu'on l'a payée, plus besoin de payer toutes
-  ses places pour pouvoir revendre.
- On s'assure que l'email fourni lors d'une demande de petit cours est valide.
-
-### BDS
-
- Le burô peut maintenant accorder ou révoquer le statut de membre du Burô
-  en modifiant le profil d'un membre du BDS.
- Le burô peut exporter la liste de ses membres avec email au format CSV depuis
-  la page d'accueil.
-
-### K-Fêt
-
- On affiche les articles actuellement en vente en premier lors des inventaires
-  et des commandes.
- On peut supprimer un inventaire. Seuls les articles dont c'est le dernier
-  inventaire sont affectés.
-
-## Version 0.8 - 03/12/2020
+## Version ??? - Bientôt

 ### COF

 - La page "Mes places" dans la section BdA indique quelles places sont sur
  listing.
- ergonomie de l'interface admin du BdA : moins d'options inutiles lors de
+- ergonomie de l'interface admin du BdA : moins d'options inutiles lors de 
  la sélection de participants.
 - les tirages sont maintenant archivables pour éviter d'avoir encore d'autres
  options inutiles.
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-# GestioCOF / GestioBDS
+# GestioCOF

 [![pipeline status](https://git.eleves.ens.fr/cof-geek/gestioCOF/badges/master/pipeline.svg)](https://git.eleves.ens.fr/cof-geek/gestioCOF/commits/master)
 [![coverage report](https://git.eleves.ens.fr/cof-geek/gestioCOF/badges/master/coverage.svg)](https://git.eleves.ens.fr/cof-geek/gestioCOF/commits/master)
@ -38,11 +38,11 @@ Vous pouvez maintenant installer les dépendances Python depuis le fichier
    pip install -U pip  # parfois nécessaire la première fois
    pip install -r requirements-devel.txt

-Pour terminer, copier le fichier `gestioasso/settings/secret_example.py` vers
-`gestioasso/settings/secret.py`. Sous Linux ou Mac, préférez plutôt un lien symbolique
+Pour terminer, copier le fichier `cof/settings/secret_example.py` vers
+`cof/settings/secret.py`. Sous Linux ou Mac, préférez plutôt un lien symbolique
 pour profiter de façon transparente des mises à jour du fichier:

-    ln -s secret_example.py gestioasso/settings/secret.py
+    ln -s secret_example.py cof/settings/secret.py

 Nous avons un git hook de pre-commit pour formatter et vérifier que votre code
 vérifie nos conventions. Pour bénéficier des mises à jour du hook, préférez
--- a/42
+++ b/42
@ -1,19 +1,47 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :

-# Configuration de base pour GestioCOF.
-# Voir https://docs.vagrantup.com pour plus d'informations.
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
 Vagrant.configure(2) do |config|
-  # On se base sur Debian 10 (Buster) pour avoir le même environnement qu'en
-  # production.
-  config.vm.box = "debian/contrib-buster64"
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  config.vm.box = "ubuntu/xenial64"

  # On associe le port 80 dans la machine virtuelle avec le port 8080 de notre
  # ordinateur, et le port 8000 avec le port 8000.
  config.vm.network :forwarded_port, guest: 80, host: 8080
  config.vm.network :forwarded_port, guest: 8000, host: 8000

-  # Le restes de la configuration (installation de paquets, etc) est géré un
-  # script shell.
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  # config.vm.network "private_network", ip: "192.168.33.10"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  # config.vm.provider "virtualbox" do |vb|
+  #   # Display the VirtualBox GUI when booting the machine
+  #   vb.gui = true
+  #
+  #   # Customize the amount of memory on the VM:
+  #   vb.memory = "1024"
+  # end
+  #
+  # View the documentation for the provider you are using for more
+  # information on available options.
+
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+  # config.vm.provision "shell", inline: <<-SHELL
+  #   sudo apt-get update
+  #   sudo apt-get install -y apache2
+  # SHELL
  config.vm.provision :shell, path: "provisioning/bootstrap.sh"
 end
--- a/bda/admin.py
+++ b/bda/admin.py
@ -33,6 +33,20 @@ class ReadOnlyMixin(object):
            return readonly_fields + self.readonly_fields_update


+class ChoixSpectacleAdminForm(forms.ModelForm):
+    class Meta:
+        widgets = {
+            "participant": ModelSelect2(url="bda-participant-autocomplete"),
+            "spectacle": ModelSelect2(url="bda-spectacle-autocomplete"),
+        }
+
+
+class ChoixSpectacleInline(admin.TabularInline):
+    model = ChoixSpectacle
+    form = ChoixSpectacleAdminForm
+    sortable_field_name = "priority"
+
+
 class AttributionTabularAdminForm(forms.ModelForm):
    listing = None

@ -211,6 +225,7 @@ class AttributionAdminForm(forms.ModelForm):


 class AttributionAdmin(ReadOnlyMixin, admin.ModelAdmin):
+
    list_display = ("id", "spectacle", "participant", "given", "paid")
    search_fields = (
        "spectacle__title",
@ -223,7 +238,7 @@ class AttributionAdmin(ReadOnlyMixin, admin.ModelAdmin):


 class ChoixSpectacleAdmin(admin.ModelAdmin):
-    autocomplete_fields = ["participant", "spectacle"]
+    form = ChoixSpectacleAdminForm

    def tirage(self, obj):
        return obj.participant.tirage
--- a/bda/algorithm.py
+++ b/bda/algorithm.py
@ -2,6 +2,7 @@ import random


 class Algorithm(object):
+
    shows = None
    ranks = None
    origranks = None
--- a/bda/forms.py
+++ b/bda/forms.py
@ -3,7 +3,7 @@ from django.forms.models import BaseInlineFormSet
 from django.template import loader
 from django.utils import timezone

-from bda.models import SpectacleRevente
+from bda.models import Attribution, Spectacle, SpectacleRevente


 class InscriptionInlineFormSet(BaseInlineFormSet):
@ -77,7 +77,7 @@ class ResellForm(forms.Form):
        super().__init__(*args, **kwargs)
        self.fields["attributions"] = TemplateLabelField(
            queryset=participant.attribution_set.filter(
-                spectacle__date__gte=timezone.now(), paid=True
+                spectacle__date__gte=timezone.now()
            )
            .exclude(revente__seller=participant)
            .select_related("spectacle", "spectacle__location", "participant__user"),
--- a/bda/management/commands/loadbdadevdata.py
+++ b/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,
--- a/bda/migrations/0001_initial.py
+++ b/bda/migrations/0001_initial.py
@ -6,6 +6,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]

    operations = [
--- a/bda/migrations/0002_add_tirage.py
+++ b/bda/migrations/0002_add_tirage.py
@ -35,6 +35,7 @@ def fill_tirage_fields(apps, schema_editor):


 class Migration(migrations.Migration):
+
    dependencies = [("bda", "0001_initial")]

    operations = [
--- a/bda/migrations/0003_update_tirage_and_spectacle.py
+++ b/bda/migrations/0003_update_tirage_and_spectacle.py
@ -5,6 +5,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    dependencies = [("bda", "0002_add_tirage")]

    operations = [
--- a/bda/migrations/0004_mails-rappel.py
+++ b/bda/migrations/0004_mails-rappel.py
@ -5,6 +5,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    dependencies = [("bda", "0003_update_tirage_and_spectacle")]

    operations = [
--- a/bda/migrations/0005_encoding.py
+++ b/bda/migrations/0005_encoding.py
@ -5,6 +5,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    dependencies = [("bda", "0004_mails-rappel")]

    operations = [
--- a/bda/migrations/0006_add_tirage_switch.py
+++ b/bda/migrations/0006_add_tirage_switch.py
@ -18,6 +18,7 @@ def forwards_func(apps, schema_editor):


 class Migration(migrations.Migration):
+
    dependencies = [("bda", "0005_encoding")]

    operations = [
--- a/bda/migrations/0007_extends_spectacle.py
+++ b/bda/migrations/0007_extends_spectacle.py
@ -5,6 +5,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    dependencies = [("bda", "0006_add_tirage_switch")]

    operations = [
--- a/bda/migrations/0008_py3.py
+++ b/bda/migrations/0008_py3.py
@ -5,6 +5,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    dependencies = [("bda", "0007_extends_spectacle")]

    operations = [
--- a/bda/migrations/0009_revente.py
+++ b/bda/migrations/0009_revente.py
@ -6,6 +6,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    dependencies = [("bda", "0008_py3")]

    operations = [
--- a/bda/migrations/0010_spectaclerevente_shotgun.py
+++ b/bda/migrations/0010_spectaclerevente_shotgun.py
@ -21,6 +21,7 @@ def forwards_func(apps, schema_editor):


 class Migration(migrations.Migration):
+
    dependencies = [("bda", "0009_revente")]

    operations = [
--- a/bda/migrations/0011_tirage_appear_catalogue.py
+++ b/bda/migrations/0011_tirage_appear_catalogue.py
@ -5,6 +5,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    dependencies = [("bda", "0010_spectaclerevente_shotgun")]

    operations = [
--- a/bda/migrations/0012_notif_time.py
+++ b/bda/migrations/0012_notif_time.py
@ -5,6 +5,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    dependencies = [("bda", "0011_tirage_appear_catalogue")]

    operations = [
--- a/bda/migrations/0012_swap_double_choice.py
+++ b/bda/migrations/0012_swap_double_choice.py
@ -13,6 +13,7 @@ def swap_double_choice(apps, schema_editor):


 class Migration(migrations.Migration):
+
    dependencies = [("bda", "0011_tirage_appear_catalogue")]

    operations = [
--- a/bda/migrations/0013_merge_20180524_2123.py
+++ b/bda/migrations/0013_merge_20180524_2123.py
@ -6,6 +6,7 @@ from django.db import migrations


 class Migration(migrations.Migration):
+
    dependencies = [("bda", "0012_notif_time"), ("bda", "0012_swap_double_choice")]

    operations = []
--- a/bda/migrations/0014_attribution_paid_field.py
+++ b/bda/migrations/0014_attribution_paid_field.py
@ -4,6 +4,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    dependencies = [("bda", "0013_merge_20180524_2123")]

    operations = [
--- a/bda/migrations/0015_move_bda_payment.py
+++ b/bda/migrations/0015_move_bda_payment.py
@ -29,6 +29,7 @@ def set_participant_payment(apps, schema_editor):


 class Migration(migrations.Migration):
+
    dependencies = [("bda", "0014_attribution_paid_field")]

    operations = [
--- a/bda/migrations/0016_delete_participant_paid.py
+++ b/bda/migrations/0016_delete_participant_paid.py
@ -4,6 +4,7 @@ from django.db import migrations


 class Migration(migrations.Migration):
+
    dependencies = [("bda", "0015_move_bda_payment")]

    operations = [
--- a/bda/migrations/0017_participant_accepte_charte.py
+++ b/bda/migrations/0017_participant_accepte_charte.py
@ -4,6 +4,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    dependencies = [("bda", "0016_delete_participant_paid")]

    operations = [
--- a/bda/migrations/0018_auto_20201021_1818.py
+++ b/bda/migrations/0018_auto_20201021_1818.py
@ -5,6 +5,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    dependencies = [
        ("bda", "0017_participant_accepte_charte"),
    ]
--- a/bda/templates/bda/participants.html
+++ b/bda/templates/bda/participants.html
@ -16,7 +16,7 @@
        <tbody>
        {% for participant in participants %}
            <tr>
-                <td data-sort-value="{{ participant.name}}">{{participant.name}}</td>
+                <td data-sort-value="{{ participan.name}}">{{participant.name}}</td>
                <td data-sort-value="{{participant.nb_places}}">{{participant.nb_places}} place{{participant.nb_places|pluralize}}</td>
                <td data-sort-value="{{participant.email}}">{{participant.email}}</td>
                <td data-sort-value="{{ participant.paid}}" class={%if participant.paid %}"greenratio"{%else%}"redratio"{%endif%}>
--- a/bda/templates/bda/revente/notpaid.html
+++ b/bda/templates/bda/revente/notpaid.html
@ -0,0 +1,6 @@
+{% extends "base_title.html" %}
+
+{% block realcontent %}
+    <h2><strong>Nope</strong></h2>
+    <p>Avant de revendre des places, il faut aller les payer !</p>
+{% endblock %}
--- a/bda/tests/test_views.py
+++ b/bda/tests/test_views.py
@ -356,9 +356,7 @@ class TestReventeManageTest(TestCase):

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

--- a/bda/views.py
+++ b/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 member, _, _, _ in members:
+    for (show, members, _) in results:
+        for (member, _, _, _) in members:
            if member.id not in members_uniq:
                members_uniq[member.id] = member
                members2[member] = []
@ -385,6 +385,12 @@ def revente_manage(request, tirage_id):
        user=request.user, tirage=tirage
    )

+    # If the participant has just been created, the `paid` field is not
+    # automatically added by our custom ObjectManager. Skip the check in this
+    # scenario.
+    if not created and not participant.paid:
+        return render(request, "bda/revente/notpaid.html", {})
+
    resellform = ResellForm(participant, prefix="resell")
    annulform = AnnulForm(participant, prefix="annul")
    soldform = SoldForm(participant, prefix="sold")
@ -700,7 +706,7 @@ def spectacle(request, tirage_id, spectacle_id):
            "username": participant.user.username,
            "email": participant.user.email,
            "given": int(attrib.given),
-            "paid": attrib.paid,
+            "paid": True,
            "nb_places": 1,
        }
        if participant.id in participants:
@ -899,6 +905,9 @@ class ParticipantAutocomplete(Select2QuerySetView):
    model = Participant
    search_fields = ("user__username", "user__first_name", "user__last_name")

+    def get_queryset(self):
+        return super().get_queryset().select_related("user", "tirage")
+

 participant_autocomplete = buro_required(ParticipantAutocomplete.as_view())

--- a/bds/forms.py
+++ b/bds/forms.py
@ -1,7 +1,6 @@
 from django import forms
 from django.contrib.auth import get_user_model
 from django.contrib.auth.forms import UserCreationForm
-from django.utils.translation import gettext_lazy as _

 from bds.models import BDSProfile

@ -9,8 +8,6 @@ User = get_user_model()


 class UserForm(forms.ModelForm):
-    is_buro = forms.BooleanField(label=_("Membre du Burô"), required=False)
-
    class Meta:
        model = User
        fields = ["email", "first_name", "last_name"]
@ -36,6 +33,4 @@ class ProfileForm(forms.ModelForm):
    class Meta:
        model = BDSProfile
        exclude = ["user"]
-        widgets = {
-            "birthdate": forms.DateInput(attrs={"type": "date"}, format="%Y-%m-%d")
-        }
+        widgets = {"birthdate": forms.DateInput(attrs={"type": "date"})}
--- a/bds/migrations/0001_initial.py
+++ b/bds/migrations/0001_initial.py
@ -8,6 +8,7 @@ import bds.models


 class Migration(migrations.Migration):
+
    initial = True

    dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]
--- a/bds/migrations/0002_bds_group.py
+++ b/bds/migrations/0002_bds_group.py
@ -9,6 +9,7 @@ def create_bds_buro_group(apps, schema_editor):


 class Migration(migrations.Migration):
+
    dependencies = [("bds", "0001_initial")]

    operations = [
--- a/bds/migrations/0003_staff_permission.py
+++ b/bds/migrations/0003_staff_permission.py
@ -4,6 +4,7 @@ from django.db import migrations


 class Migration(migrations.Migration):
+
    dependencies = [
        ("bds", "0002_bds_group"),
    ]
--- a/bds/migrations/0004_is_member_cotiz_type.py
+++ b/bds/migrations/0004_is_member_cotiz_type.py
@ -4,6 +4,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    dependencies = [
        ("bds", "0003_staff_permission"),
    ]
--- a/bds/migrations/0005_remove_bdsprofile_certificate_file.py
+++ b/bds/migrations/0005_remove_bdsprofile_certificate_file.py
@ -4,6 +4,7 @@ from django.db import migrations


 class Migration(migrations.Migration):
+
    dependencies = [
        ("bds", "0004_is_member_cotiz_type"),
    ]
--- a/bds/migrations/0006_bdsprofile_comments.py
+++ b/bds/migrations/0006_bdsprofile_comments.py
@ -4,6 +4,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    dependencies = [
        ("bds", "0005_remove_bdsprofile_certificate_file"),
    ]
--- a/bds/models.py
+++ b/bds/models.py
@ -3,7 +3,6 @@ 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
@ -94,16 +93,6 @@ 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")
--- a/bds/templates/bds/expired_members.html
+++ b/bds/templates/bds/expired_members.html
@ -1,22 +0,0 @@
-{% 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 %}
--- a/bds/templates/bds/home.html
+++ b/bds/templates/bds/home.html
@ -7,7 +7,7 @@
    <section class="section">
      <div class="box">
        <div class="content has-text-centered">
-          <h1>{{ member_count }}</h1>
+          <h1>{{ member_count }}</h1> 
          adhérent·e·s
        </div>
      </div>
@ -34,13 +34,6 @@
        <br>
        <br>

-        <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>
-
        Le site est encore en développement.
        <br>
        Suivez notre avancement sur
@ -59,4 +52,4 @@
 {% endblock layout %}


-
+  
--- a/bds/templates/bds/user_update.html
+++ b/bds/templates/bds/user_update.html
@ -5,100 +5,100 @@
 {% block content %}

 {% for form in forms.values %}
-{% for error in form.non_field_errors %}
-<div class="notification is-danger">
-    {{ error }}
-</div>
-{% endfor %}
+  {% for error in form.non_field_errors %}
+    <div class="notification is-danger">
+      {{ error }}
+    </div>
+  {% endfor %}
 {% endfor %}

 <h1 class="title">{% trans "Modification du profil " %}{{ view.user.username }}</h1>

 <div class="container">
-    <form method="post" action="" id="user-update-form">
-        {% csrf_token %}
+  <form method="post" action="" id="user-update-form">
+    {% csrf_token %}

-        {% for form in forms.values %}
-        {% include "bds/forms/form.html" with form=form errors=False %}
-        {% endfor %}
-    </form>
+    {% for form in forms.values %}
+      {% include "bds/forms/form.html" with form=form errors=False %}
+    {% endfor %}
+  </form>

-    <form method="post" action="{% url 'bds:user.delete' view.user.pk %}" id="user-delete-form">
-        {% csrf_token %}
-    </form>
-
-    <div class="columns is-gapless mt-5">
-        <div class="column is-5">
-            <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>
+  <form method="post" action="{% url 'bds:user.delete' view.user.pk %}" id="user-delete-form">
+    {% csrf_token %}
+  </form>
+  
+  <div class="columns is-gapless mt-5">
+    <div class="column is-5">
+      <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>

 <!-- Hidden by default -->
 <div id="confirm-delete-modal" class="modal">
-    <div class="modal-background"></div>
-    <div class="modal-card">
-        <header class="modal-card-head">
-            <p class="modal-card-title">Confirmer la suppression</p>
-            <button id="modal-close" class="delete" aria-label="close"></button>
-        </header>
-        <section class="modal-card-body">
-            Voulez-vous réellement supprimer ce compte ? Attention, cette opération est irréversible !
-        </section>
-        <footer class="modal-card-foot">
-            <button id="confirm-delete-button" class="button is-primary">Supprimer</button>
-            <button id="cancel-delete-button" class="button">Annuler</button>
-        </footer>
-    </div>
+  <div class="modal-background"></div>
+  <div class="modal-card">
+    <header class="modal-card-head">
+      <p class="modal-card-title">Confirmer la suppression</p>
+      <button id= "modal-close" class="delete" aria-label="close"></button>
+    </header>
+    <section class="modal-card-body">
+      Voulez-vous réellement supprimer ce compte ? Attention, cette opération est irréversible !
+    </section>
+    <footer class="modal-card-foot">
+      <button id="confirm-delete-button" class="button is-primary">Supprimer</button>
+      <button id="cancel-delete-button" class="button">Annuler</button>
+    </footer>
+  </div>
 </div>

 <script type="text/javascript">
-    $(document).ready(function() {
-        "use strict";
+  $(document).ready(function() {
+    "use strict";

-        // Adapted from https://bulma.io/lib/main.js
-        function openModal(target) {
-            $(document).addClass('is-clipped');
-            $(`#${target}`).addClass('is-active');
-        }
+    // Adapted from https://bulma.io/lib/main.js
+    function openModal(target) {
+      $(document).addClass('is-clipped');
+      $(`#${target}`).addClass('is-active');
+    }

-        function closeModals() {
-            $(document).removeClass('is-clipped');
-            $(".modal").removeClass('is-active');
-        }
+    function closeModals() {
+      $(document).removeClass('is-clipped');
+      $(".modal").removeClass('is-active');
+    }

-        // Si on clique sur enregistrer, ça marche
-        $("#user-update-button").on("click", function() {
-            $("#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 enregistrer, ça marche
+    $("#user-update-button").on("click", function() {
+      $("#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 %}
--- a/bds/tests/test_views.py
+++ b/bds/tests/test_views.py
@ -22,18 +22,6 @@ def login_url(next=None):
        return "{}?next={}".format(login_url, next)


-class TestHomeView(TestCase):
-    @mock.patch("gestioncof.signals.messages")
-    def test_get(self, mock_messages):
-        user = User.objects.create_user(username="random_user")
-        give_bds_buro_permissions(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)
-
-
 class TestRegistrationView(TestCase):
    @mock.patch("gestioncof.signals.messages")
    def test_get_autocomplete(self, mock_messages):
@ -46,7 +34,7 @@ class TestRegistrationView(TestCase):
        self.assertRedirects(resp, login_url(next=url))

        # Logged-in but unprivileged GET
-        client.force_login(user, backend="django.contrib.auth.backends.ModelBackend")
+        client.force_login(user)
        resp = client.get(url)
        self.assertEquals(resp.status_code, 403)

@ -66,7 +54,7 @@ class TestRegistrationView(TestCase):
        self.assertRedirects(resp, login_url(next=url))

        # Logged-in but unprivileged GET
-        client.force_login(user, backend="django.contrib.auth.backends.ModelBackend")
+        client.force_login(user)
        resp = client.get(url)
        self.assertEquals(resp.status_code, 403)

--- a/bds/urls.py
+++ b/bds/urls.py
@ -14,11 +14,4 @@ urlpatterns = [
        name="user.create.fromclipper",
    ),
    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"),
 ]
--- a/bds/views.py
+++ b/bds/views.py
@ -1,14 +1,9 @@
-import csv
-
 from django.contrib import messages
 from django.contrib.auth import get_user_model
-from django.contrib.auth.decorators import permission_required
-from django.contrib.auth.models import Permission
-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, ListView, RedirectView, TemplateView
+from django.views.generic import DeleteView, TemplateView

 from bds.autocomplete import bds_search
 from bds.forms import ProfileForm, UserForm, UserFromClipperForm, UserFromScratchForm
@ -30,7 +25,6 @@ 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


@ -42,9 +36,6 @@ class UserUpdateView(StaffRequiredMixin, MultipleFormView):
        "profile": ProfileForm,
    }

-    def get_user_initial(self):
-        return {"is_buro": self.get_user_instance().has_perm("bds.is_team")}
-
    def dispatch(self, request, *args, **kwargs):
        self.user = get_object_or_404(User, pk=self.kwargs["pk"])
        return super().dispatch(request, *args, **kwargs)
@ -61,11 +52,6 @@ class UserUpdateView(StaffRequiredMixin, MultipleFormView):
    def form_valid(self, forms):
        user = forms["user"].save()
        profile = forms["profile"].save(commit=False)
-        perm = Permission.objects.get(content_type__app_label="bds", codename="is_team")
-        if forms["user"].cleaned_data["is_buro"]:
-            user.user_permissions.add(perm)
-        else:
-            user.user_permissions.remove(perm)
        profile.user = user
        profile.save()
        messages.success(self.request, _("Profil mis à jour avec succès !"))
@ -142,43 +128,3 @@ class UserDeleteView(StaffRequiredMixin, DeleteView):
        messages.success(request, self.success_message)

        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")
-    response["Content-Disposition"] = "attachment; filename=membres_bds.csv"
-
-    writer = csv.writer(response)
-    for profile in BDSProfile.objects.filter(is_member=True).all():
-        user = profile.user
-        bits = [
-            user.username,
-            user.get_full_name(),
-            user.email,
-        ]
-        writer.writerow([str(bit) for bit in bits])
-
-    return response
--- a/clubs/migrations/0001_initial.py
+++ b/clubs/migrations/0001_initial.py
@ -5,6 +5,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    initial = True

    dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]
--- a/gestioasso/init.py
+++ b/gestioasso/init.py
--- a/gestioasso/apps.py
+++ b/gestioasso/apps.py
--- a/gestioasso/asgi.py
+++ b/gestioasso/asgi.py
@ -3,6 +3,6 @@ import os
 from channels.asgi import get_channel_layer

 if "DJANGO_SETTINGS_MODULE" not in os.environ:
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "gestioasso.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "cof.settings")

 channel_layer = get_channel_layer()
--- a/gestioasso/locale/init.py
+++ b/gestioasso/locale/init.py
--- a/gestioasso/locale/en/init.py
+++ b/gestioasso/locale/en/init.py
--- a/gestioasso/locale/en/formats.py
+++ b/gestioasso/locale/en/formats.py
--- a/gestioasso/locale/fr/init.py
+++ b/gestioasso/locale/fr/init.py
--- a/gestioasso/locale/fr/formats.py
+++ b/gestioasso/locale/fr/formats.py
--- a/gestioasso/routing.py
+++ b/gestioasso/routing.py
--- a/gestioasso/settings/.gitignore
+++ b/gestioasso/settings/.gitignore
--- a/gestioasso/settings/init.py
+++ b/gestioasso/settings/init.py
--- a/gestioasso/settings/bds_prod.py
+++ b/gestioasso/settings/bds_prod.py
@ -1,9 +1,7 @@
 """
-Settings de production de GestioBDS.
-
-Surcharge les settings définis dans common.py
+Django development settings for the cof project.
+The settings that are not listed here are imported from .common
 """
-
 from .common import *  # NOQA
 from .common import INSTALLED_APPS

--- a/gestioasso/settings/cof_prod.py
+++ b/gestioasso/settings/cof_prod.py
@ -1,13 +1,8 @@
 """
-Settings de production de GestioCOF.
-
-Surcharge les settings définis dans common.py
+Django development settings for the cof project.
+The settings that are not listed here are imported from .common
 """
-
 import os
-from datetime import timedelta
-
-from django.utils import timezone

 from .common import *  # NOQA
 from .common import (
@ -28,8 +23,8 @@ REDIS_DB = import_secret("REDIS_DB")
 REDIS_HOST = import_secret("REDIS_HOST")
 REDIS_PORT = import_secret("REDIS_PORT")

-HCAPTCHA_SITEKEY = import_secret("HCAPTCHA_SITEKEY")
-HCAPTCHA_SECRET = import_secret("HCAPTCHA_SECRET")
+RECAPTCHA_PUBLIC_KEY = import_secret("RECAPTCHA_PUBLIC_KEY")
+RECAPTCHA_PRIVATE_KEY = import_secret("RECAPTCHA_PRIVATE_KEY")
 KFETOPEN_TOKEN = import_secret("KFETOPEN_TOKEN")

 # ---
@ -52,7 +47,7 @@ INSTALLED_APPS = (
    + [
        "bda",
        "petitscours",
-        "hcaptcha",
+        "captcha",
        "kfet",
        "kfet.open",
        "channels",
@ -113,17 +108,11 @@ CORS_ORIGIN_WHITELIST = ("bda.ens.fr", "www.bda.ens.fr" "cof.ens.fr", "www.cof.e
 # Auth-related stuff
 # ---

-AUTHENTICATION_BACKENDS = (
-    [
-        # Must be in first
-        "kfet.auth.backends.BlockFrozenAccountBackend"
-    ]
-    + AUTHENTICATION_BACKENDS
-    + [
-        "gestioncof.shared.COFCASBackend",
-        "kfet.auth.backends.GenericBackend",
-    ]
-)
+AUTHENTICATION_BACKENDS += [
+    "gestioncof.shared.COFCASBackend",
+    "kfet.auth.backends.GenericBackend",
+]
+
 LOGIN_URL = "cof-login"
 LOGIN_REDIRECT_URL = "home"

@ -160,7 +149,7 @@ CHANNEL_LAYERS = {
                )
            ]
        },
-        "ROUTING": "gestioasso.routing.routing",
+        "ROUTING": "cof.routing.routing",
    }
 }

@ -206,29 +195,8 @@ 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>",
    },
 }
-
-# ---
-# kfet history limits
-# ---
-
-# L'historique n'est accesible que d'aujourd'hui
-# à aujourd'hui - KFET_HISTORY_DATE_LIMIT
-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
--- a/gestioasso/settings/common.py
+++ b/gestioasso/settings/common.py
@ -1,5 +1,8 @@
 """
-Settings par défaut et settings communs à GestioCOF et GestioBDS.
+Django common settings for cof project.
+
+Everything which is supposed to be identical between the production server and
+the local development server should be here.
 """

 import os
@ -62,7 +65,7 @@ INSTALLED_APPS = [
    "django.contrib.messages",
    "django.contrib.admin",
    "django.contrib.admindocs",
-    "gestioasso.apps.IgnoreSrcStaticFilesConfig",
+    "cof.apps.IgnoreSrcStaticFilesConfig",
    "django_cas_ng",
    "bootstrapform",
    "widget_tweaks",
@ -79,7 +82,7 @@ MIDDLEWARE = [
    "django.middleware.locale.LocaleMiddleware",
 ]

-ROOT_URLCONF = "gestioasso.urls"
+ROOT_URLCONF = "cof.urls"

 TEMPLATES = [
    {
@ -123,7 +126,7 @@ USE_I18N = True
 USE_L10N = True
 USE_TZ = True
 LANGUAGES = (("fr", "Français"), ("en", "English"))
-FORMAT_MODULE_PATH = "gestioasso.locale"
+FORMAT_MODULE_PATH = "cof.locale"


 # ---
--- a/gestioasso/settings/local.py
+++ b/gestioasso/settings/local.py
@ -1,9 +1,4 @@
-"""
-Settings utilisés lors d'un développement en local (dans un virtualenv).
-Active toutes les applications (de GestioCOF et de GestioBDS).
-
-Surcharge les settings définis dans common.py
-"""
+"""Django local development settings."""
 import os

 from . import bds_prod
@ -48,7 +43,7 @@ CACHES = {"default": {"BACKEND": "django.core.cache.backends.locmem.LocMemCache"
 CHANNEL_LAYERS = {
    "default": {
        "BACKEND": "asgiref.inmemory.ChannelLayer",
-        "ROUTING": "gestioasso.routing.routing",
+        "ROUTING": "cof.routing.routing",
    }
 }

--- a/gestioasso/settings/secret_example.py
+++ b/gestioasso/settings/secret_example.py
@ -1,7 +1,3 @@
-"""
-Secrets à re-définir en production.
-"""
-
 SECRET_KEY = "q()(zn4m63i%5cp4)f+ww4-28_w+ly3q9=6imw2ciu&_(5_4ah"
 ADMINS = None
 SERVER_EMAIL = "root@vagrant"
@ -16,8 +12,8 @@ REDIS_PORT = 6379
 REDIS_DB = 0
 REDIS_HOST = "127.0.0.1"

-HCAPTCHA_SITEKEY = "10000000-ffff-ffff-ffff-000000000001"
-HCAPTCHA_SECRET = "0x0000000000000000000000000000000000000000"
+RECAPTCHA_PUBLIC_KEY = "DUMMY"
+RECAPTCHA_PRIVATE_KEY = "DUMMY"

 EMAIL_HOST = None

--- a/gestioasso/urls.py
+++ b/gestioasso/urls.py
@ -8,23 +8,21 @@ from django.contrib import admin
 from django.urls import include, path
 from django.views.generic.base import RedirectView

-bds_is_alone = (
-    "bds" in settings.INSTALLED_APPS and "gestioncof" not in settings.INSTALLED_APPS
-)
-
 admin.autodiscover()
 urlpatterns = [
+    # Redirection / → /gestion, only useful for developpers.
+    path("", RedirectView.as_view(url="gestion/")),
    # Website administration (independent from installed apps)
    path("admin/doc/", include("django.contrib.admindocs.urls")),
    path("admin/", admin.site.urls),
 ]

-if not bds_is_alone:
-    # Redirection / → /gestion, only useful for developpers.
-    urlpatterns.append(path("", RedirectView.as_view(url="gestion/")))
-
 # App-specific urls

+bds_is_alone = (
+    "bds" in settings.INSTALLED_APPS and "gestioncof" not in settings.INSTALLED_APPS
+)
+
 app_dict = {
    "bds": "" if bds_is_alone else "bds/",
    "kfet": "k-fet/",
@ -35,7 +33,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)))]

--- a/gestioasso/wsgi.py
+++ b/gestioasso/wsgi.py
@ -2,5 +2,5 @@ import os

 from django.core.wsgi import get_wsgi_application

-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "gestioasso.settings.bds_prod")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "cof.settings.bds_prod")
 application = get_wsgi_application()
--- a/events/migrations/0001_event.py
+++ b/events/migrations/0001_event.py
@ -4,6 +4,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    initial = True

    dependencies = []
--- a/events/migrations/0002_event_subscribers.py
+++ b/events/migrations/0002_event_subscribers.py
@ -5,6 +5,7 @@ from django.db import migrations, models


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


 class Migration(migrations.Migration):
+
    dependencies = [
        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
        ("events", "0002_event_subscribers"),
--- a/events/migrations/0004_unique_constraints.py
+++ b/events/migrations/0004_unique_constraints.py
@ -5,6 +5,7 @@ from django.db import migrations


 class Migration(migrations.Migration):
+
    dependencies = [
        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
        ("events", "0003_options_and_extra_fields"),
--- a/events/tests/test_views.py
+++ b/events/tests/test_views.py
@ -54,9 +54,7 @@ class CSVExportAccessTest(MessagePatch, TestCase):

    def test_get(self):
        client = Client()
-        client.force_login(
-            self.staff, backend="django.contrib.auth.backends.ModelBackend"
-        )
+        client.force_login(self.staff)
        r = client.get(self.url)
        self.assertEqual(r.status_code, 200)

@ -68,7 +66,7 @@ class CSVExportAccessTest(MessagePatch, TestCase):

    def test_unauthorised(self):
        client = Client()
-        client.force_login(self.u1, backend="django.contrib.auth.backends.ModelBackend")
+        client.force_login(self.u1)
        r = client.get(self.url)
        self.assertEqual(r.status_code, 403)

@ -88,9 +86,7 @@ class CSVExportContentTest(MessagePatch, CSVResponseMixin, TestCase):
        )
        self.staff = make_staff_user("staff")
        self.client = Client()
-        self.client.force_login(
-            self.staff, backend="django.contrib.auth.backends.ModelBackend"
-        )
+        self.client.force_login(self.staff)

    def test_simple_event(self):
        self.event.subscribers.set([self.u1, self.u2])
--- a/gestioasso/settings/dev.py
+++ b/gestioasso/settings/dev.py
@ -1,64 +0,0 @@
-"""
-Settings utilisés dans la VM Vagrant.
-Active toutes les applications (de GestioCOF et de GestioBDS).
-
-Surcharge les settings définis dans common.py
-"""
-
-import os
-
-from . import bds_prod
-from .cof_prod import *  # NOQA
-from .cof_prod import INSTALLED_APPS, MIDDLEWARE, TESTING
-
-# ---
-# Merge COF and BDS configs
-# ---
-
-for app in bds_prod.INSTALLED_APPS:
-    if app not in INSTALLED_APPS:
-        INSTALLED_APPS.append(app)
-
-# ---
-# Tweaks for debug/local development
-# ---
-
-ALLOWED_HOSTS = []
-
-DEBUG = True
-EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
-
-if TESTING:
-    PASSWORD_HASHERS = ["django.contrib.auth.hashers.MD5PasswordHasher"]
-
-STATIC_URL = "/static/"
-STATIC_ROOT = "/srv/gestiocof/static"
-MEDIA_URL = "/media/"
-MEDIA_ROOT = "/srv/gestiocof/media"
-
-
-# ---
-# Debug tool bar
-# ---
-
-
-def show_toolbar(request):
-    """
-    On active la debug-toolbar en mode développement local sauf :
-    - dans l'admin où ça ne sert pas à grand chose;
-    - si la variable d'environnement DJANGO_NO_DDT est à 1 → ça permet de la désactiver
-      sans modifier ce fichier en exécutant `export DJANGO_NO_DDT=1` dans le terminal
-      qui lance `./manage.py runserver`.
-
-    Autre side effect de cette fonction : on ne fait pas la vérification de INTERNAL_IPS
-    que ferait la debug-toolbar par défaut, ce qui la fait fonctionner aussi à
-    l'intérieur de Vagrant (comportement non testé depuis un moment…)
-    """
-    env_no_ddt = bool(os.environ.get("DJANGO_NO_DDT", None))
-    return DEBUG and not env_no_ddt and not request.path.startswith("/admin/")
-
-
-if not TESTING:
-    INSTALLED_APPS += ["debug_toolbar"]
-    MIDDLEWARE = ["debug_toolbar.middleware.DebugToolbarMiddleware"] + MIDDLEWARE
-    DEBUG_TOOLBAR_CONFIG = {"SHOW_TOOLBAR_CALLBACK": show_toolbar}
--- a/gestioncof/admin.py
+++ b/gestioncof/admin.py
@ -100,6 +100,28 @@ class CofProfileInline(admin.StackedInline):
    inline_classes = ("collapse open",)


+class FkeyLookup(object):
+    def __init__(self, fkeydecl, short_description=None, admin_order_field=None):
+        self.fk, fkattrs = fkeydecl.split("__", 1)
+        self.fkattrs = fkattrs.split("__")
+
+        self.short_description = short_description or self.fkattrs[-1]
+        self.admin_order_field = admin_order_field or fkeydecl
+
+    def __get__(self, obj, klass):
+        if obj is None:
+            """
+            hack required to make Django validate (if obj is
+            None, then we're a class, and classes are callable
+            <wink>)
+            """
+            return self
+        item = getattr(obj, self.fk)
+        for attr in self.fkattrs:
+            item = getattr(item, attr)
+        return item
+
+
 def ProfileInfo(field, short_description, boolean=False):
    def getter(self):
        try:
@ -112,6 +134,7 @@ def ProfileInfo(field, short_description, boolean=False):
    return getter


+User.profile_login_clipper = FkeyLookup("profile__login_clipper", "Login clipper")
 User.profile_phone = ProfileInfo("phone", "Téléphone")
 User.profile_occupation = ProfileInfo("occupation", "Occupation")
 User.profile_departement = ProfileInfo("departement", "Departement")
@ -140,6 +163,7 @@ class UserProfileAdmin(UserAdmin):
    is_cof.boolean = True

    list_display = UserAdmin.list_display + (
+        "profile_login_clipper",
        "profile_phone",
        "profile_occupation",
        "profile_mailing_cof",
--- a/gestioncof/cms/migrations/0001_initial.py
+++ b/gestioncof/cms/migrations/0001_initial.py
@ -13,6 +13,7 @@ import gestioncof.cms.models


 class Migration(migrations.Migration):
+
    initial = True

    dependencies = [
--- a/gestioncof/cms/migrations/0002_auto_20190523_1521.py
+++ b/gestioncof/cms/migrations/0002_auto_20190523_1521.py
@ -4,6 +4,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    dependencies = [("cofcms", "0001_initial")]

    operations = [
--- a/gestioncof/cms/migrations/0003_directory_entry_optional_links.py
+++ b/gestioncof/cms/migrations/0003_directory_entry_optional_links.py
@ -6,6 +6,7 @@ from django.db import migrations


 class Migration(migrations.Migration):
+
    dependencies = [
        ("cofcms", "0002_auto_20190523_1521"),
    ]
--- a/gestioncof/cms/migrations/0004_auto_20200829_2314.py
+++ b/gestioncof/cms/migrations/0004_auto_20200829_2314.py
@ -6,6 +6,7 @@ from django.db import migrations


 class Migration(migrations.Migration):
+
    dependencies = [
        ("cofcms", "0003_directory_entry_optional_links"),
    ]
--- a/gestioncof/cms/templates/cofcms/base.html
+++ b/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 %}

-                    {% get_current_language as curlang %}
-
-                    <div class="lang-select">
+			        <div class="lang-select">
                        {% if curlang == 'en' %}
-                            {% language 'fr' %}
-                            <a href="{% pageurl self %}" title="Français"><img src="{% static "cofcms/images/fr.png" %}"></a>
-                            {% endlanguage %}
+			                {% language 'fr' %}
+			                <a href="{% pageurl self %}" title="Français"><img src="{% static "cofcms/images/fr.png" %}"></a>
+			                {% endlanguage %}
                        {% else %}
-                            {% language 'en' %}
-                            <a href="{% pageurl self %}" title="English"><img src="{% static "cofcms/images/en.png" %}"></a>
+			                {% language 'en' %}
+			                <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>
--- a/gestioncof/cms/templates/cofcms/cof_actu_index_page.html
+++ b/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|richtext }}</div>
+        <div>{{ page.introduction|safe }}</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>
-        {% endif %}
+	        <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 %}
        {% 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>
-        {% endif %}
-
+	        <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 %}
+        
        {% 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|richtext|truncatewords_html:15 }}
+                        {{ actu.body|safe|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>
-        {% endif %}
+	        <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 %}
        {% 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>
-        {% endif %}
+	        <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 %}
    </section>
 {% endblock %}
--- a/gestioncof/cms/templates/cofcms/cof_actu_page.html
+++ b/gestioncof/cms/templates/cofcms/cof_actu_page.html
@ -1,5 +1,5 @@
 {% extends "cofcms/base.html" %}
-{% load wagtailcore_tags wagtailimages_tags cofcms_tags i18n %}
+{% load 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|richtext }}
+            {{ page.body|safe }}
        </article>
    </section>
 {% endblock %}
--- a/gestioncof/cms/templates/cofcms/cof_directory_page.html
+++ b/gestioncof/cms/templates/cofcms/cof_directory_page.html
@ -1,5 +1,5 @@
 {% extends "cofcms/base_aside.html" %}
-{% load wagtailcore_tags wagtailimages_tags cofcms_tags static i18n %}
+{% load 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|richtext }}</div>
+        <div>{{ page.introduction|safe }}</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|richtext }}</div>
+                <div class="desc">{{ entry.body|safe }}</div>
                {% if entry.links %}
                    <ul class="links">
                        {% for block in entry.links %}
--- a/gestioncof/cms/templates/cofcms/cof_page.html
+++ b/gestioncof/cms/templates/cofcms/cof_page.html
@ -1,10 +1,10 @@
 {% extends "cofcms/base.html" %}
-{% load wagtailcore_tags wagtailimages_tags cofcms_tags %}
+{% load wagtailimages_tags cofcms_tags %}

 {% block content %}
    <section class="intro">
        <h1>{{ page.title }}</h1>
-        <div>{{ page.introduction|richtext }}</div>
+        <div>{{ page.introduction|safe }}</div>
    </section>

    <section class="pagecontent">
@ -13,7 +13,7 @@
                <h2>{{ block.value }}</h2>
            {% elif block.block_type == "paragraph" %}
                <article class="paragraph">
-                    {{ block.value|richtext }}
+                    {{ block.value|safe }}
                </article>
            {% elif block.block_type == "image" %}
                <div class="image">
--- a/gestioncof/cms/templates/cofcms/cof_root_page.html
+++ b/gestioncof/cms/templates/cofcms/cof_root_page.html
@ -18,7 +18,7 @@
 {% block content %}
    <section class="intro">
        <h1>{{ page.title }}</h1>
-        <div>{{ page.introduction|richtext }}</div>
+        <div>{{ page.introduction|safe }}</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|richtext|truncatewords_html:10 }}
+                        {{ actu.body|safe|truncatewords_html:10 }}
                    {% endif %}
                </div>
                <a href="{% pageurl actu %}" class="actu-overlay"></a>
--- a/gestioncof/migrations/0001_initial.py
+++ b/gestioncof/migrations/0001_initial.py
@ -6,6 +6,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]

    operations = [
--- a/gestioncof/migrations/0002_enable_unprocessed_demandes.py
+++ b/gestioncof/migrations/0002_enable_unprocessed_demandes.py
@ -5,6 +5,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    dependencies = [("gestioncof", "0001_initial")]

    operations = [
--- a/gestioncof/migrations/0003_event_image.py
+++ b/gestioncof/migrations/0003_event_image.py
@ -5,6 +5,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    dependencies = [("gestioncof", "0002_enable_unprocessed_demandes")]

    operations = [
--- a/gestioncof/migrations/0004_registration_mail.py
+++ b/gestioncof/migrations/0004_registration_mail.py
@ -25,6 +25,7 @@ def create_mail(apps, schema_editor):


 class Migration(migrations.Migration):
+
    dependencies = [("gestioncof", "0003_event_image")]

    operations = [
--- a/gestioncof/migrations/0005_encoding.py
+++ b/gestioncof/migrations/0005_encoding.py
@ -5,6 +5,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    dependencies = [("gestioncof", "0004_registration_mail")]

    operations = [
--- a/gestioncof/migrations/0006_add_calendar.py
+++ b/gestioncof/migrations/0006_add_calendar.py
@ -6,6 +6,7 @@ from django.db import migrations, models


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


 class Migration(migrations.Migration):
+
    dependencies = [("gestioncof", "0006_add_calendar")]

    operations = [
--- a/gestioncof/migrations/0008_py3.py
+++ b/gestioncof/migrations/0008_py3.py
@ -10,6 +10,7 @@ def forwards(apps, schema_editor):


 class Migration(migrations.Migration):
+
    dependencies = [("gestioncof", "0007_alter_club")]

    operations = [
--- a/gestioncof/migrations/0009_delete_clipper.py
+++ b/gestioncof/migrations/0009_delete_clipper.py
@ -5,6 +5,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    dependencies = [("gestioncof", "0008_py3")]

    operations = [migrations.DeleteModel(name="Clipper")]
--- a/gestioncof/migrations/0010_delete_custommail.py
+++ b/gestioncof/migrations/0010_delete_custommail.py
@ -4,6 +4,7 @@ from django.db import migrations


 class Migration(migrations.Migration):
+
    dependencies = [("gestioncof", "0009_delete_clipper")]

    operations = [migrations.DeleteModel(name="CustomMail")]
--- a/gestioncof/migrations/0011_longer_clippers.py
+++ b/gestioncof/migrations/0011_longer_clippers.py
@ -5,6 +5,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    dependencies = [("gestioncof", "0010_delete_custommail")]

    operations = [
--- a/gestioncof/migrations/0011_remove_cofprofile_num.py
+++ b/gestioncof/migrations/0011_remove_cofprofile_num.py
@ -5,6 +5,7 @@ from django.db import migrations


 class Migration(migrations.Migration):
+
    dependencies = [("gestioncof", "0010_delete_custommail")]

    operations = [migrations.RemoveField(model_name="cofprofile", name="num")]
--- a/gestioncof/migrations/0012_merge.py
+++ b/gestioncof/migrations/0012_merge.py
@ -5,6 +5,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    dependencies = [
        ("gestioncof", "0011_remove_cofprofile_num"),
        ("gestioncof", "0011_longer_clippers"),
--- a/gestioncof/migrations/0013_pei.py
+++ b/gestioncof/migrations/0013_pei.py
@ -5,6 +5,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    dependencies = [("gestioncof", "0012_merge")]

    operations = [
--- a/gestioncof/migrations/0014_cofprofile_mailing_unernestaparis.py
+++ b/gestioncof/migrations/0014_cofprofile_mailing_unernestaparis.py
@ -6,6 +6,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    dependencies = [("gestioncof", "0013_pei")]

    operations = [
--- a/gestioncof/migrations/0015_psql_choices_niveaux.py
+++ b/gestioncof/migrations/0015_psql_choices_niveaux.py
@ -6,6 +6,7 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
+
    dependencies = [("gestioncof", "0014_cofprofile_mailing_unernestaparis")]

    operations = [
--- a/gestioncof/migrations/0016_unique_clippers.py
+++ b/gestioncof/migrations/0016_unique_clippers.py
@ -16,6 +16,7 @@ def null_clippers_to_empty(apps, schema_editor):


 class Migration(migrations.Migration):
+
    dependencies = [("gestioncof", "0015_psql_choices_niveaux")]

    operations = [
--- a/Show more
+++ b/Show more