fix(prepare_django): make the .static dir

Reviewed-on: #838

.credentials/HCAPTCHA_SECRET

@@ -0,0 +1 @@
+0x0000000000000000000000000000000000000000

.credentials/HCAPTCHA_SITEKEY

@@ -0,0 +1 @@
+10000000-ffff-ffff-ffff-000000000001

.credentials/KFETOPEN_TOKEN

@@ -0,0 +1 @@
+k-feste_token

.credentials/SECRET_KEY

@@ -0,0 +1 @@
+insecure-key

.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

@@ -23,8 +23,60 @@ adhérents ni des cotisations.
 
 ## 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

README.md

@@ -18,7 +18,7 @@ Il vous faudra installer pip, les librairies de développement de python ainsi
 que sqlite3, un moteur de base de données léger et simple d'utilisation. Sous
 Debian et dérivées (Ubuntu, ...) :
 
-    sudo apt-get install python3-pip python3-dev python3-venv sqlite3
+    sudo apt-get install python3-pip python3-dev python3-venv sqlite3 libsasl2-dev python-dev-is-python3 libldap2-dev libssl-dev
 
 Si vous décidez d'utiliser un environnement virtuel Python (virtualenv;
 fortement conseillé), déplacez-vous dans le dossier où est installé GestioCOF
@@ -30,7 +30,15 @@ Pour l'activer, il faut taper
 
     . venv/bin/activate
 
-depuis le même dossier.
+depuis le même dossier. Pour préparer l'environnement à l'utilisation de `./manage.py`
+(qui permet de faire des tests en local), il faut également taper
+
+    export CREDENTIALS_DIRECTORY=$(realpath .credentials)
+    export DJANGO_SETTINGS_MODULE=gestioasso.settings.local
+    export GESTIOCOF_DEBUG=true
+    export GESTIOCOF_STATIC_ROOT=$(realpath .static)
+    export GESTIOBDS_DEBUG=true
+    export GESTIOBDS_STATIC_ROOT=$(realpath .static)
 
 Vous pouvez maintenant installer les dépendances Python depuis le fichier
 `requirements-devel.txt` :

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/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

@@ -31,7 +31,7 @@ class TestHomeView(TestCase):
             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):
@@ -48,12 +48,12 @@ class TestRegistrationView(TestCase):
         # Logged-in but unprivileged GET
         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):
@@ -68,9 +68,9 @@ class TestRegistrationView(TestCase):
         # Logged-in but unprivileged GET
         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)

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,
@@ -65,8 +67,8 @@ INSTALLED_APPS = (
         "wagtail.images",
         "wagtail.search",
         "wagtail.admin",
-        "wagtail.core",
+        "wagtail",
-        "wagtail.contrib.modeladmin",
+        # "wagtail.contrib.modeladmin",
         "wagtail.contrib.routable_page",
         "wagtailmenus",
         "modelcluster",
@@ -83,7 +85,6 @@ MIDDLEWARE = (
     + MIDDLEWARE
     + [
         "djconfig.middleware.DjConfigMiddleware",
-        "wagtail.core.middleware.SiteMiddleware",
         "wagtail.contrib.redirects.middleware.RedirectMiddleware",
     ]
 )
@@ -107,6 +108,8 @@ 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
 # ---
@@ -145,7 +148,7 @@ CACHES = {
 
 CHANNEL_LAYERS = {
     "default": {
-        "BACKEND": "asgi_redis.RedisChannelLayer",
+        "BACKEND": "shared.channels.ChannelLayer",
         "CONFIG": {
             "hosts": [
                 (
@@ -158,11 +161,9 @@ CHANNEL_LAYERS = {
                 )
             ]
         },
-        "ROUTING": "gestioasso.routing.routing",
     }
 }
 
-
 # ---
 # reCAPTCHA settings
 # https://github.com/praekelt/django-recaptcha
@@ -204,8 +205,9 @@ MAIL_DATA = {
         "REPLYTO": "cof@ens.fr",
     },
     "rappels": {"FROM": "Le BdA <bda@ens.fr>", "REPLYTO": "Le BdA <bda@ens.fr>"},
-    "rappel_negatif": {
+    "kfet": {
-        "FROM": "La K-Fêt <k-fet@ens.fr>",
+        "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>",
@@ -224,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/settings_bds.py

@@ -0,0 +1,194 @@
+"""
+Django settings for the gestioBDS project.
+"""
+
+import os
+from pathlib import Path
+
+from loadcredential import Credentials
+
+credentials = Credentials(env_prefix="GESTIOBDS_")
+
+# Build paths inside the project like this: BASE_DIR / 'subdir'.
+BASE_DIR = Path(__file__).resolve().parent.parent
+
+# WARNING: keep the secret key used in production secret!
+SECRET_KEY = credentials["SECRET_KEY"]
+
+# WARNING: don't run with debug turned on in production!
+DEBUG = credentials.get_json("DEBUG", False)
+
+ALLOWED_HOSTS = credentials.get_json("ALLOWED_HOSTS", [])
+ADMINS = credentials.get_json("ADMINS", [])
+
+SERVER_EMAIL = credentials.get("SERVER_EMAIL")
+EMAIL_HOST = credentials.get("EMAIL_HOST")
+
+DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
+
+
+##
+# Installed Apps configuration
+
+INSTALLED_APPS = [
+    "shared",
+    # Must be before 'django.contrib.admin'.
+    # https://django-autocomplete-light.readthedocs.io/en/master/install.html
+    "dal",
+    "dal_select2",
+    "django.contrib.auth",
+    "django.contrib.contenttypes",
+    "django.contrib.sessions",
+    "django.contrib.sites",
+    "django.contrib.messages",
+    "django.contrib.admin",
+    "django.contrib.admindocs",
+    "gestioasso.apps.IgnoreSrcStaticFilesConfig",
+    "django_cas_ng",
+    "bootstrapform",
+    "widget_tweaks",
+    "bds",
+    "events",
+    "clubs",
+    "authens",
+]
+
+
+##
+# Middleware configuration
+
+MIDDLEWARE = [
+    "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.middleware.common.CommonMiddleware",
+    "django.middleware.csrf.CsrfViewMiddleware",
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.contrib.messages.middleware.MessageMiddleware",
+    "django.middleware.clickjacking.XFrameOptionsMiddleware",
+    "django.middleware.security.SecurityMiddleware",
+    "django.middleware.locale.LocaleMiddleware",
+]
+
+
+##
+# URL configuration
+
+ROOT_URLCONF = "gestioasso.urls"
+
+
+##
+# Templates configuration
+
+TEMPLATES = [
+    {
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
+        "APP_DIRS": True,
+        "OPTIONS": {
+            "context_processors": [
+                "django.template.context_processors.debug",
+                "django.template.context_processors.request",
+                "django.contrib.auth.context_processors.auth",
+                "django.contrib.messages.context_processors.messages",
+                "django.template.context_processors.i18n",
+                "django.template.context_processors.media",
+                "django.template.context_processors.static",
+            ]
+        },
+    }
+]
+
+
+##
+# Database configuration
+
+DATABASES = credentials.get_json(
+    "DATABASES",
+    default={
+        "default": {
+            "ENGINE": "django.db.backends.sqlite3",
+            "NAME": (BASE_DIR / "db.sqlite3"),
+        }
+    },
+)
+
+CACHES = credentials.get_json(
+    "CACHES",
+    default={
+        "default": {
+            "BACKEND": "django.core.cache.backends.locmem.LocMemCache",
+        },
+    },
+)
+
+CORS_ORIGIN_WHITELIST = credentials.get("CORS_ORIGIN_WHITELIST", [])
+
+
+SITE_ID = 1
+
+
+###
+# Staticfiles configuration
+
+STATIC_ROOT = credentials["STATIC_ROOT"]
+STATIC_URL = "/static/"
+
+MEDIA_ROOT = credentials.get("MEDIA_ROOT", (BASE_DIR / "media"))
+MEDIA_URL = "/media/"
+
+
+##
+# Authens and Authentication configuration
+
+AUTHENTICATION_BACKENDS = [
+    "django.contrib.auth.backends.ModelBackend",
+    "authens.backends.ENSCASBackend",
+    "authens.backends.OldCASBackend",
+]
+
+AUTHENS_USE_OLDCAS = False
+
+LOGIN_URL = "authens:login"
+LOGIN_REDIRECT_URL = "bds:home"
+LOGOUT_REDIRECT_URL = "bds:home"
+
+
+# ---
+# Internationalization
+# https://docs.djangoproject.com/en/1.8/topics/i18n/
+# ---
+
+LANGUAGE_CODE = "fr-fr"
+TIME_ZONE = "Europe/Paris"
+USE_I18N = True
+USE_L10N = True
+USE_TZ = True
+LANGUAGES = (("fr", "Français"), ("en", "English"))
+FORMAT_MODULE_PATH = "gestioasso.locale"
+
+##
+# Development configuration
+
+if DEBUG:
+    EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
+
+    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 not (env_no_ddt or request.path.startswith("/admin/"))
+
+    ##
+    # Django Debug Toolbar configuration
+
+    DEBUG_TOOLBAR_CONFIG = {"SHOW_TOOLBAR_CALLBACK": show_toolbar}
+    INSTALLED_APPS += ["debug_toolbar"]
+    MIDDLEWARE = ["debug_toolbar.middleware.DebugToolbarMiddleware"] + MIDDLEWARE

gestioasso/settings_cof.py

@@ -0,0 +1,318 @@
+"""
+Django settings for the gestioCOF project.
+"""
+
+import os
+from datetime import datetime, timedelta
+from pathlib import Path
+
+from django.urls import reverse_lazy
+from loadcredential import Credentials
+
+credentials = Credentials(env_prefix="GESTIOCOF_")
+
+# Build paths inside the project like this: BASE_DIR / 'subdir'.
+BASE_DIR = Path(__file__).resolve().parent.parent
+
+# WARNING: keep the secret key used in production secret!
+SECRET_KEY = credentials["SECRET_KEY"]
+
+# WARNING: don't run with debug turned on in production!
+DEBUG = credentials.get_json("DEBUG", False)
+
+ALLOWED_HOSTS = credentials.get_json("ALLOWED_HOSTS", [])
+ADMINS = credentials.get_json("ADMINS", [])
+
+SERVER_EMAIL = credentials.get("SERVER_EMAIL")
+EMAIL_HOST = credentials.get("EMAIL_HOST")
+
+LDAP_SERVER_URL = credentials.get("LDAP_SERVER_URL")
+
+DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
+
+
+##
+# Installed Apps configuration
+
+INSTALLED_APPS = [
+    "gestioncof",
+    # Must be before django admin
+    # https://github.com/infoportugal/wagtail-modeltranslation/issues/193
+    "wagtail_modeltranslation",
+    "wagtail_modeltranslation.makemigrations",
+    "wagtail_modeltranslation.migrate",
+    "modeltranslation",
+    "shared",
+    # Must be before 'django.contrib.admin'.
+    # https://django-autocomplete-light.readthedocs.io/en/master/install.html
+    "dal",
+    "dal_select2",
+    "django.contrib.auth",
+    "django.contrib.contenttypes",
+    "django.contrib.sessions",
+    "django.contrib.sites",
+    "django.contrib.messages",
+    "django.contrib.admin",
+    "django.contrib.admindocs",
+    "gestioasso.apps.IgnoreSrcStaticFilesConfig",
+    "django_cas_ng",
+    "bootstrapform",
+    "widget_tweaks",
+    "bda",
+    "petitscours",
+    "hcaptcha",
+    "kfet",
+    "kfet.open",
+    "channels",
+    "djconfig",
+    "wagtail.contrib.forms",
+    "wagtail.contrib.redirects",
+    "wagtail.embeds",
+    "wagtail.sites",
+    "wagtail.users",
+    "wagtail.snippets",
+    "wagtail.documents",
+    "wagtail.images",
+    "wagtail.search",
+    "wagtail.admin",
+    "wagtail",
+    # "wagtail.contrib.modeladmin",
+    "wagtail.contrib.routable_page",
+    "wagtailmenus",
+    "modelcluster",
+    "taggit",
+    "kfet.auth",
+    "kfet.cms",
+    "gestioncof.cms",
+    "django_js_reverse",
+]
+
+
+##
+# Middleware configuration
+
+MIDDLEWARE = [
+    "corsheaders.middleware.CorsMiddleware",
+    "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.middleware.common.CommonMiddleware",
+    "django.middleware.csrf.CsrfViewMiddleware",
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.contrib.messages.middleware.MessageMiddleware",
+    "django.middleware.clickjacking.XFrameOptionsMiddleware",
+    "django.middleware.security.SecurityMiddleware",
+    "django.middleware.locale.LocaleMiddleware",
+    "djconfig.middleware.DjConfigMiddleware",
+    "wagtail.contrib.redirects.middleware.RedirectMiddleware",
+]
+
+
+##
+# URL configuration
+
+ROOT_URLCONF = "gestioasso.urls"
+
+
+##
+# Templates configuration
+
+TEMPLATES = [
+    {
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
+        "APP_DIRS": True,
+        "OPTIONS": {
+            "context_processors": [
+                "wagtailmenus.context_processors.wagtailmenus",
+                "djconfig.context_processors.config",
+                "gestioncof.shared.context_processor",
+                "kfet.auth.context_processors.temporary_auth",
+                "kfet.context_processors.config",
+                "django.template.context_processors.debug",
+                "django.template.context_processors.request",
+                "django.contrib.auth.context_processors.auth",
+                "django.contrib.messages.context_processors.messages",
+                "django.template.context_processors.i18n",
+                "django.template.context_processors.media",
+                "django.template.context_processors.static",
+            ]
+        },
+    }
+]
+
+
+##
+# Wagtail configuration
+
+WAGTAIL_SITE_NAME = "GestioCOF"
+WAGTAIL_ENABLE_UPDATE_CHECK = False
+TAGGIT_CASE_INSENSITIVE = True
+
+##
+# Django-js-reverse settings
+
+JS_REVERSE_JS_VAR_NAME = "django_urls"
+# Quand on aura namespace les urls...
+# JS_REVERSE_INCLUDE_ONLY_NAMESPACES = ['k-fet']
+
+##
+# K-Fêt history configuration
+
+# 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 = datetime(1794, 10, 30)  # AKA the distant past
+
+
+##
+# Database configuration
+
+DATABASES = credentials.get_json(
+    "DATABASES",
+    default={
+        "default": {
+            "ENGINE": "django.db.backends.sqlite3",
+            "NAME": (BASE_DIR / "db.sqlite3"),
+        }
+    },
+)
+
+CACHES = credentials.get_json(
+    "CACHES",
+    default={
+        "default": {
+            "BACKEND": "django.core.cache.backends.locmem.LocMemCache",
+        },
+    },
+)
+
+CHANNEL_LAYERS = credentials.get_json(
+    "CHANNEL_LAYERS",
+    default={
+        "default": {
+            "BACKEND": "channels.layers.InMemoryChannelLayer",
+        }
+    },
+)
+
+CORS_ORIGIN_WHITELIST = credentials.get("CORS_ORIGIN_WHITELIST", [])
+
+
+SITE_ID = 1
+
+
+###
+# Staticfiles configuration
+
+STATIC_ROOT = credentials["STATIC_ROOT"]
+STATIC_URL = "/static/"
+
+MEDIA_ROOT = credentials.get("MEDIA_ROOT", (BASE_DIR / "media"))
+MEDIA_URL = "/media/"
+
+
+##
+# Authentication configuration
+
+AUTHENTICATION_BACKENDS = [
+    "kfet.auth.backends.BlockFrozenAccountBackend",  # Must be in first
+    "django.contrib.auth.backends.ModelBackend",
+    "gestioncof.shared.COFCASBackend",
+    "kfet.auth.backends.GenericBackend",
+]
+
+LOGIN_URL = "cof-login"
+LOGIN_REDIRECT_URL = reverse_lazy("home")
+
+# FIXME: Switch to authens
+CAS_SERVER_URL = "https://cas.eleves.ens.fr/"
+CAS_VERSION = "2"
+CAS_LOGIN_MSG = None
+CAS_IGNORE_REFERER = True
+CAS_REDIRECT_URL = "/"
+CAS_EMAIL_FORMAT = "%s@clipper.ens.fr"
+
+
+##
+# h-captcha configuration
+
+HCAPTCHA_SITEKEY = credentials["HCAPTCHA_SITEKEY"]
+HCAPTCHA_SECRET = credentials["HCAPTCHA_SECRET"]
+
+##
+# K-Fêt token for the openness indicator
+
+KFETOPEN_TOKEN = credentials["KFETOPEN_TOKEN"]
+
+
+##
+# Mail configuration
+
+MAIL_DATA = {
+    "petits_cours": {
+        "FROM": "Le COF <cof@ens.fr>",
+        "BCC": "archivescof@gmail.com",
+        "REPLYTO": "cof@ens.fr",
+    },
+    "rappels": {
+        "FROM": "Le BdA <bda@ens.fr>",
+        "REPLYTO": "Le BdA <bda@ens.fr>",
+    },
+    "rappel_negatif": {
+        "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>",
+    },
+}
+
+
+# ---
+# Internationalization
+# https://docs.djangoproject.com/en/1.8/topics/i18n/
+# ---
+
+LANGUAGE_CODE = "fr-fr"
+TIME_ZONE = "Europe/Paris"
+USE_I18N = True
+USE_L10N = True
+USE_TZ = True
+LANGUAGES = (("fr", "Français"), ("en", "English"))
+FORMAT_MODULE_PATH = "gestioasso.locale"
+
+##
+# Development configuration
+
+if DEBUG:
+    EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
+
+    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 not (env_no_ddt or request.path.startswith("/admin/"))
+
+    ##
+    # Django Debug Toolbar configuration
+
+    DEBUG_TOOLBAR_CONFIG = {"SHOW_TOOLBAR_CALLBACK": show_toolbar}
+    INSTALLED_APPS += ["debug_toolbar"]
+    MIDDLEWARE = ["debug_toolbar.middleware.DebugToolbarMiddleware"] + MIDDLEWARE

gestioasso/urls.py

@@ -1,6 +1,7 @@
 """
 Fichier principal de configuration des urls du projet GestioCOF
 """
+
 from django.conf import settings
 from django.conf.urls.i18n import i18n_patterns
 from django.conf.urls.static import static
@@ -35,7 +36,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)))]
 
@@ -58,10 +59,10 @@ if settings.DEBUG:
     urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 
-# Wagtail URLs (wagtail.core urls must be last, as catch-all)
+# Wagtail URLs (wagtail urls must be last, as catch-all)
-if "wagtail.core" in settings.INSTALLED_APPS:
+if "wagtail" in settings.INSTALLED_APPS:
+    from wagtail import urls as wagtail_urls
     from wagtail.admin import urls as wagtailadmin_urls
-    from wagtail.core import urls as wagtail_urls
     from wagtail.documents import urls as wagtaildocs_urls
 
     urlpatterns += [

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

@@ -3,9 +3,9 @@
 from __future__ import unicode_literals
 
 import django.db.models.deletion
+import wagtail.blocks
 import wagtail.contrib.routable_page.models
-import wagtail.core.blocks
+import wagtail.fields
-import wagtail.core.fields
 import wagtail.images.blocks
 from django.db import migrations, models
 
@@ -13,7 +13,6 @@ import gestioncof.cms.models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [
@@ -73,18 +72,14 @@ class Migration(migrations.Migration):
                         blank=True, null=True, verbose_name="Description rapide"
                     ),
                 ),
-                ("body", wagtail.core.fields.RichTextField(verbose_name="Contenu")),
+                ("body", wagtail.fields.RichTextField(verbose_name="Contenu")),
                 (
                     "body_fr",
-                    wagtail.core.fields.RichTextField(
+                    wagtail.fields.RichTextField(null=True, verbose_name="Contenu"),
-                        null=True, verbose_name="Contenu"
-                    ),
                 ),
                 (
                     "body_en",
-                    wagtail.core.fields.RichTextField(
+                    wagtail.fields.RichTextField(null=True, verbose_name="Contenu"),
-                        null=True, verbose_name="Contenu"
-                    ),
                 ),
                 (
                     "is_event",
@@ -139,46 +134,40 @@ class Migration(migrations.Migration):
                         to="wagtailcore.Page",
                     ),
                 ),
-                ("body", wagtail.core.fields.RichTextField(verbose_name="Description")),
+                ("body", wagtail.fields.RichTextField(verbose_name="Description")),
                 (
                     "body_fr",
-                    wagtail.core.fields.RichTextField(
+                    wagtail.fields.RichTextField(null=True, verbose_name="Description"),
-                        null=True, verbose_name="Description"
-                    ),
                 ),
                 (
                     "body_en",
-                    wagtail.core.fields.RichTextField(
+                    wagtail.fields.RichTextField(null=True, verbose_name="Description"),
-                        null=True, verbose_name="Description"
-                    ),
                 ),
                 (
                     "links",
-                    wagtail.core.fields.StreamField(
+                    wagtail.fields.StreamField(
                         [
                             (
                                 "lien",
-                                wagtail.core.blocks.StructBlock(
+                                wagtail.blocks.StructBlock(
                                     [
                                         (
                                             "url",
-                                            wagtail.core.blocks.URLBlock(required=True),
+                                            wagtail.blocks.URLBlock(required=True),
                                         ),
-                                        ("texte", wagtail.core.blocks.CharBlock()),
+                                        ("texte", wagtail.blocks.CharBlock()),
                                     ]
                                 ),
                             ),
                             (
                                 "contact",
-                                wagtail.core.blocks.StructBlock(
+                                wagtail.blocks.StructBlock(
                                     [
                                         (
                                             "email",
-                                            wagtail.core.blocks.EmailBlock(
+                                            wagtail.blocks.EmailBlock(required=True),
-                                                required=True
-                                            ),
                                         ),
-                                        ("texte", wagtail.core.blocks.CharBlock()),
+                                        ("texte", wagtail.blocks.CharBlock()),
                                     ]
                                 ),
                             ),
@@ -187,31 +176,29 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "links_fr",
-                    wagtail.core.fields.StreamField(
+                    wagtail.fields.StreamField(
                         [
                             (
                                 "lien",
-                                wagtail.core.blocks.StructBlock(
+                                wagtail.blocks.StructBlock(
                                     [
                                         (
                                             "url",
-                                            wagtail.core.blocks.URLBlock(required=True),
+                                            wagtail.blocks.URLBlock(required=True),
                                         ),
-                                        ("texte", wagtail.core.blocks.CharBlock()),
+                                        ("texte", wagtail.blocks.CharBlock()),
                                     ]
                                 ),
                             ),
                             (
                                 "contact",
-                                wagtail.core.blocks.StructBlock(
+                                wagtail.blocks.StructBlock(
                                     [
                                         (
                                             "email",
-                                            wagtail.core.blocks.EmailBlock(
+                                            wagtail.blocks.EmailBlock(required=True),
-                                                required=True
-                                            ),
                                         ),
-                                        ("texte", wagtail.core.blocks.CharBlock()),
+                                        ("texte", wagtail.blocks.CharBlock()),
                                     ]
                                 ),
                             ),
@@ -221,31 +208,29 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "links_en",
-                    wagtail.core.fields.StreamField(
+                    wagtail.fields.StreamField(
                         [
                             (
                                 "lien",
-                                wagtail.core.blocks.StructBlock(
+                                wagtail.blocks.StructBlock(
                                     [
                                         (
                                             "url",
-                                            wagtail.core.blocks.URLBlock(required=True),
+                                            wagtail.blocks.URLBlock(required=True),
                                         ),
-                                        ("texte", wagtail.core.blocks.CharBlock()),
+                                        ("texte", wagtail.blocks.CharBlock()),
                                     ]
                                 ),
                             ),
                             (
                                 "contact",
-                                wagtail.core.blocks.StructBlock(
+                                wagtail.blocks.StructBlock(
                                     [
                                         (
                                             "email",
-                                            wagtail.core.blocks.EmailBlock(
+                                            wagtail.blocks.EmailBlock(required=True),
-                                                required=True
-                                            ),
                                         ),
-                                        ("texte", wagtail.core.blocks.CharBlock()),
+                                        ("texte", wagtail.blocks.CharBlock()),
                                     ]
                                 ),
                             ),
@@ -287,17 +272,17 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "introduction",
-                    wagtail.core.fields.RichTextField(verbose_name="Introduction"),
+                    wagtail.fields.RichTextField(verbose_name="Introduction"),
                 ),
                 (
                     "introduction_fr",
-                    wagtail.core.fields.RichTextField(
+                    wagtail.fields.RichTextField(
                         null=True, verbose_name="Introduction"
                     ),
                 ),
                 (
                     "introduction_en",
-                    wagtail.core.fields.RichTextField(
+                    wagtail.fields.RichTextField(
                         null=True, verbose_name="Introduction"
                     ),
                 ),
@@ -330,27 +315,27 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "body",
-                    wagtail.core.fields.StreamField(
+                    wagtail.fields.StreamField(
                         [
                             (
                                 "heading",
-                                wagtail.core.blocks.CharBlock(classname="full title"),
+                                wagtail.blocks.CharBlock(classname="full title"),
                             ),
-                            ("paragraph", wagtail.core.blocks.RichTextBlock()),
+                            ("paragraph", wagtail.blocks.RichTextBlock()),
                             ("image", wagtail.images.blocks.ImageChooserBlock()),
                             (
                                 "iframe",
-                                wagtail.core.blocks.StructBlock(
+                                wagtail.blocks.StructBlock(
                                     [
                                         (
                                             "url",
-                                            wagtail.core.blocks.URLBlock(
+                                            wagtail.blocks.URLBlock(
                                                 "Adresse de la page"
                                             ),
                                         ),
                                         (
                                             "height",
-                                            wagtail.core.blocks.CharBlock(
+                                            wagtail.blocks.CharBlock(
                                                 "Hauteur (en pixels)"
                                             ),
                                         ),
@@ -362,27 +347,27 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "body_fr",
-                    wagtail.core.fields.StreamField(
+                    wagtail.fields.StreamField(
                         [
                             (
                                 "heading",
-                                wagtail.core.blocks.CharBlock(classname="full title"),
+                                wagtail.blocks.CharBlock(classname="full title"),
                             ),
-                            ("paragraph", wagtail.core.blocks.RichTextBlock()),
+                            ("paragraph", wagtail.blocks.RichTextBlock()),
                             ("image", wagtail.images.blocks.ImageChooserBlock()),
                             (
                                 "iframe",
-                                wagtail.core.blocks.StructBlock(
+                                wagtail.blocks.StructBlock(
                                     [
                                         (
                                             "url",
-                                            wagtail.core.blocks.URLBlock(
+                                            wagtail.blocks.URLBlock(
                                                 "Adresse de la page"
                                             ),
                                         ),
                                         (
                                             "height",
-                                            wagtail.core.blocks.CharBlock(
+                                            wagtail.blocks.CharBlock(
                                                 "Hauteur (en pixels)"
                                             ),
                                         ),
@@ -395,27 +380,27 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "body_en",
-                    wagtail.core.fields.StreamField(
+                    wagtail.fields.StreamField(
                         [
                             (
                                 "heading",
-                                wagtail.core.blocks.CharBlock(classname="full title"),
+                                wagtail.blocks.CharBlock(classname="full title"),
                             ),
-                            ("paragraph", wagtail.core.blocks.RichTextBlock()),
+                            ("paragraph", wagtail.blocks.RichTextBlock()),
                             ("image", wagtail.images.blocks.ImageChooserBlock()),
                             (
                                 "iframe",
-                                wagtail.core.blocks.StructBlock(
+                                wagtail.blocks.StructBlock(
                                     [
                                         (
                                             "url",
-                                            wagtail.core.blocks.URLBlock(
+                                            wagtail.blocks.URLBlock(
                                                 "Adresse de la page"
                                             ),
                                         ),
                                         (
                                             "height",
-                                            wagtail.core.blocks.CharBlock(
+                                            wagtail.blocks.CharBlock(
                                                 "Hauteur (en pixels)"
                                             ),
                                         ),
@@ -449,17 +434,17 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "introduction",
-                    wagtail.core.fields.RichTextField(verbose_name="Introduction"),
+                    wagtail.fields.RichTextField(verbose_name="Introduction"),
                 ),
                 (
                     "introduction_fr",
-                    wagtail.core.fields.RichTextField(
+                    wagtail.fields.RichTextField(
                         null=True, verbose_name="Introduction"
                     ),
                 ),
                 (
                     "introduction_en",
-                    wagtail.core.fields.RichTextField(
+                    wagtail.fields.RichTextField(
                         null=True, verbose_name="Introduction"
                     ),
                 ),

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

@@ -1,12 +1,11 @@
 # Generated by Django 2.2.8 on 2019-12-20 16:22
 
-import wagtail.core.blocks
+import wagtail.blocks
-import wagtail.core.fields
+import wagtail.fields
 from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("cofcms", "0002_auto_20190523_1521"),
     ]
@@ -15,26 +14,26 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="cofdirectoryentrypage",
             name="links",
-            field=wagtail.core.fields.StreamField(
+            field=wagtail.fields.StreamField(
                 [
                     (
                         "lien",
-                        wagtail.core.blocks.StructBlock(
+                        wagtail.blocks.StructBlock(
                             [
-                                ("url", wagtail.core.blocks.URLBlock(required=True)),
+                                ("url", wagtail.blocks.URLBlock(required=True)),
-                                ("texte", wagtail.core.blocks.CharBlock()),
+                                ("texte", wagtail.blocks.CharBlock()),
                             ]
                         ),
                     ),
                     (
                         "contact",
-                        wagtail.core.blocks.StructBlock(
+                        wagtail.blocks.StructBlock(
                             [
                                 (
                                     "email",
-                                    wagtail.core.blocks.EmailBlock(required=True),
+                                    wagtail.blocks.EmailBlock(required=True),
                                 ),
-                                ("texte", wagtail.core.blocks.CharBlock()),
+                                ("texte", wagtail.blocks.CharBlock()),
                             ]
                         ),
                     ),
@@ -45,26 +44,26 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="cofdirectoryentrypage",
             name="links_en",
-            field=wagtail.core.fields.StreamField(
+            field=wagtail.fields.StreamField(
                 [
                     (
                         "lien",
-                        wagtail.core.blocks.StructBlock(
+                        wagtail.blocks.StructBlock(
                             [
-                                ("url", wagtail.core.blocks.URLBlock(required=True)),
+                                ("url", wagtail.blocks.URLBlock(required=True)),
-                                ("texte", wagtail.core.blocks.CharBlock()),
+                                ("texte", wagtail.blocks.CharBlock()),
                             ]
                         ),
                     ),
                     (
                         "contact",
-                        wagtail.core.blocks.StructBlock(
+                        wagtail.blocks.StructBlock(
                             [
                                 (
                                     "email",
-                                    wagtail.core.blocks.EmailBlock(required=True),
+                                    wagtail.blocks.EmailBlock(required=True),
                                 ),
-                                ("texte", wagtail.core.blocks.CharBlock()),
+                                ("texte", wagtail.blocks.CharBlock()),
                             ]
                         ),
                     ),
@@ -76,26 +75,26 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="cofdirectoryentrypage",
             name="links_fr",
-            field=wagtail.core.fields.StreamField(
+            field=wagtail.fields.StreamField(
                 [
                     (
                         "lien",
-                        wagtail.core.blocks.StructBlock(
+                        wagtail.blocks.StructBlock(
                             [
-                                ("url", wagtail.core.blocks.URLBlock(required=True)),
+                                ("url", wagtail.blocks.URLBlock(required=True)),
-                                ("texte", wagtail.core.blocks.CharBlock()),
+                                ("texte", wagtail.blocks.CharBlock()),
                             ]
                         ),
                     ),
                     (
                         "contact",
-                        wagtail.core.blocks.StructBlock(
+                        wagtail.blocks.StructBlock(
                             [
                                 (
                                     "email",
-                                    wagtail.core.blocks.EmailBlock(required=True),
+                                    wagtail.blocks.EmailBlock(required=True),
                                 ),
-                                ("texte", wagtail.core.blocks.CharBlock()),
+                                ("texte", wagtail.blocks.CharBlock()),
                             ]
                         ),
                     ),

gestioncof/cms/migrations/0004_auto_20200829_2314.py

@@ -1,12 +1,11 @@
 # Generated by Django 2.2.15 on 2020-08-29 21:14
 
-import wagtail.core.blocks
+import wagtail.blocks
-import wagtail.core.fields
+import wagtail.fields
 from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("cofcms", "0003_directory_entry_optional_links"),
     ]
@@ -15,35 +14,35 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="cofdirectoryentrypage",
             name="links",
-            field=wagtail.core.fields.StreamField(
+            field=wagtail.fields.StreamField(
                 [
                     (
                         "lien",
-                        wagtail.core.blocks.StructBlock(
+                        wagtail.blocks.StructBlock(
                             [
-                                ("url", wagtail.core.blocks.URLBlock(required=True)),
+                                ("url", wagtail.blocks.URLBlock(required=True)),
-                                ("texte", wagtail.core.blocks.CharBlock()),
+                                ("texte", wagtail.blocks.CharBlock()),
                             ]
                         ),
                     ),
                     (
                         "contact",
-                        wagtail.core.blocks.StructBlock(
+                        wagtail.blocks.StructBlock(
                             [
                                 (
                                     "email",
-                                    wagtail.core.blocks.EmailBlock(required=True),
+                                    wagtail.blocks.EmailBlock(required=True),
                                 ),
-                                ("texte", wagtail.core.blocks.CharBlock()),
+                                ("texte", wagtail.blocks.CharBlock()),
                             ]
                         ),
                     ),
                     (
                         "info",
-                        wagtail.core.blocks.StructBlock(
+                        wagtail.blocks.StructBlock(
                             [
-                                ("nom", wagtail.core.blocks.CharBlock(required=False)),
+                                ("nom", wagtail.blocks.CharBlock(required=False)),
-                                ("texte", wagtail.core.blocks.CharBlock(required=True)),
+                                ("texte", wagtail.blocks.CharBlock(required=True)),
                             ]
                         ),
                     ),
@@ -54,35 +53,35 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="cofdirectoryentrypage",
             name="links_en",
-            field=wagtail.core.fields.StreamField(
+            field=wagtail.fields.StreamField(
                 [
                     (
                         "lien",
-                        wagtail.core.blocks.StructBlock(
+                        wagtail.blocks.StructBlock(
                             [
-                                ("url", wagtail.core.blocks.URLBlock(required=True)),
+                                ("url", wagtail.blocks.URLBlock(required=True)),
-                                ("texte", wagtail.core.blocks.CharBlock()),
+                                ("texte", wagtail.blocks.CharBlock()),
                             ]
                         ),
                     ),
                     (
                         "contact",
-                        wagtail.core.blocks.StructBlock(
+                        wagtail.blocks.StructBlock(
                             [
                                 (
                                     "email",
-                                    wagtail.core.blocks.EmailBlock(required=True),
+                                    wagtail.blocks.EmailBlock(required=True),
                                 ),
-                                ("texte", wagtail.core.blocks.CharBlock()),
+                                ("texte", wagtail.blocks.CharBlock()),
                             ]
                         ),
                     ),
                     (
                         "info",
-                        wagtail.core.blocks.StructBlock(
+                        wagtail.blocks.StructBlock(
                             [
-                                ("nom", wagtail.core.blocks.CharBlock(required=False)),
+                                ("nom", wagtail.blocks.CharBlock(required=False)),
-                                ("texte", wagtail.core.blocks.CharBlock(required=True)),
+                                ("texte", wagtail.blocks.CharBlock(required=True)),
                             ]
                         ),
                     ),
@@ -94,35 +93,35 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="cofdirectoryentrypage",
             name="links_fr",
-            field=wagtail.core.fields.StreamField(
+            field=wagtail.fields.StreamField(
                 [
                     (
                         "lien",
-                        wagtail.core.blocks.StructBlock(
+                        wagtail.blocks.StructBlock(
                             [
-                                ("url", wagtail.core.blocks.URLBlock(required=True)),
+                                ("url", wagtail.blocks.URLBlock(required=True)),
-                                ("texte", wagtail.core.blocks.CharBlock()),
+                                ("texte", wagtail.blocks.CharBlock()),
                             ]
                         ),
                     ),
                     (
                         "contact",
-                        wagtail.core.blocks.StructBlock(
+                        wagtail.blocks.StructBlock(
                             [
                                 (
                                     "email",
-                                    wagtail.core.blocks.EmailBlock(required=True),
+                                    wagtail.blocks.EmailBlock(required=True),
                                 ),
-                                ("texte", wagtail.core.blocks.CharBlock()),
+                                ("texte", wagtail.blocks.CharBlock()),
                             ]
                         ),
                     ),
                     (
                         "info",
-                        wagtail.core.blocks.StructBlock(
+                        wagtail.blocks.StructBlock(
                             [
-                                ("nom", wagtail.core.blocks.CharBlock(required=False)),
+                                ("nom", wagtail.blocks.CharBlock(required=False)),
-                                ("texte", wagtail.core.blocks.CharBlock(required=True)),
+                                ("texte", wagtail.blocks.CharBlock(required=True)),
                             ]
                         ),
                     ),

gestioncof/cms/migrations/0005_alter_cofdirectoryentrypage_links_and_more.py

@@ -0,0 +1,203 @@
+# Generated by Django 4.2.17 on 2024-12-19 12:27
+
+import wagtail.blocks
+import wagtail.fields
+import wagtail.images.blocks
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("cofcms", "0004_auto_20200829_2314"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="cofdirectoryentrypage",
+            name="links",
+            field=wagtail.fields.StreamField(
+                [
+                    (
+                        "lien",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("url", wagtail.blocks.URLBlock(required=True)),
+                                ("texte", wagtail.blocks.CharBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "contact",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("email", wagtail.blocks.EmailBlock(required=True)),
+                                ("texte", wagtail.blocks.CharBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "info",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("nom", wagtail.blocks.CharBlock(required=False)),
+                                ("texte", wagtail.blocks.CharBlock(required=True)),
+                            ]
+                        ),
+                    ),
+                ],
+                blank=True,
+                use_json_field=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="cofdirectoryentrypage",
+            name="links_en",
+            field=wagtail.fields.StreamField(
+                [
+                    (
+                        "lien",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("url", wagtail.blocks.URLBlock(required=True)),
+                                ("texte", wagtail.blocks.CharBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "contact",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("email", wagtail.blocks.EmailBlock(required=True)),
+                                ("texte", wagtail.blocks.CharBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "info",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("nom", wagtail.blocks.CharBlock(required=False)),
+                                ("texte", wagtail.blocks.CharBlock(required=True)),
+                            ]
+                        ),
+                    ),
+                ],
+                blank=True,
+                null=True,
+                use_json_field=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="cofdirectoryentrypage",
+            name="links_fr",
+            field=wagtail.fields.StreamField(
+                [
+                    (
+                        "lien",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("url", wagtail.blocks.URLBlock(required=True)),
+                                ("texte", wagtail.blocks.CharBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "contact",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("email", wagtail.blocks.EmailBlock(required=True)),
+                                ("texte", wagtail.blocks.CharBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "info",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("nom", wagtail.blocks.CharBlock(required=False)),
+                                ("texte", wagtail.blocks.CharBlock(required=True)),
+                            ]
+                        ),
+                    ),
+                ],
+                blank=True,
+                null=True,
+                use_json_field=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="cofpage",
+            name="body",
+            field=wagtail.fields.StreamField(
+                [
+                    ("heading", wagtail.blocks.CharBlock(form_classname="full title")),
+                    ("paragraph", wagtail.blocks.RichTextBlock()),
+                    ("image", wagtail.images.blocks.ImageChooserBlock()),
+                    (
+                        "iframe",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("url", wagtail.blocks.URLBlock("Adresse de la page")),
+                                (
+                                    "height",
+                                    wagtail.blocks.CharBlock("Hauteur (en pixels)"),
+                                ),
+                            ]
+                        ),
+                    ),
+                ],
+                use_json_field=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="cofpage",
+            name="body_en",
+            field=wagtail.fields.StreamField(
+                [
+                    ("heading", wagtail.blocks.CharBlock(form_classname="full title")),
+                    ("paragraph", wagtail.blocks.RichTextBlock()),
+                    ("image", wagtail.images.blocks.ImageChooserBlock()),
+                    (
+                        "iframe",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("url", wagtail.blocks.URLBlock("Adresse de la page")),
+                                (
+                                    "height",
+                                    wagtail.blocks.CharBlock("Hauteur (en pixels)"),
+                                ),
+                            ]
+                        ),
+                    ),
+                ],
+                null=True,
+                use_json_field=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="cofpage",
+            name="body_fr",
+            field=wagtail.fields.StreamField(
+                [
+                    ("heading", wagtail.blocks.CharBlock(form_classname="full title")),
+                    ("paragraph", wagtail.blocks.RichTextBlock()),
+                    ("image", wagtail.images.blocks.ImageChooserBlock()),
+                    (
+                        "iframe",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("url", wagtail.blocks.URLBlock("Adresse de la page")),
+                                (
+                                    "height",
+                                    wagtail.blocks.CharBlock("Hauteur (en pixels)"),
+                                ),
+                            ]
+                        ),
+                    ),
+                ],
+                null=True,
+                use_json_field=True,
+            ),
+        ),
+    ]

gestioncof/cms/models.py

@@ -1,12 +1,11 @@
 from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 from django.db import models
-from wagtail.admin.edit_handlers import FieldPanel, StreamFieldPanel
+from wagtail import blocks
+from wagtail.admin.panels import FieldPanel
 from wagtail.contrib.routable_page.models import RoutablePageMixin, route
-from wagtail.core import blocks
+from wagtail.fields import RichTextField, StreamField
-from wagtail.core.fields import RichTextField, StreamField
-from wagtail.core.models import Page
 from wagtail.images.blocks import ImageChooserBlock
-from wagtail.images.edit_handlers import ImageChooserPanel
+from wagtail.models import Page
 
 
 # Page pouvant afficher des actualités
@@ -69,10 +68,11 @@ class COFPage(Page):
             ("paragraph", blocks.RichTextBlock()),
             ("image", ImageChooserBlock()),
             ("iframe", IFrameBlock()),
-        ]
+        ],
+        use_json_field=True,
     )
 
-    content_panels = Page.content_panels + [StreamFieldPanel("body")]
+    content_panels = Page.content_panels + [FieldPanel("body")]
 
     subpage_types = ["COFDirectoryPage", "COFPage"]
     parent_page_types = ["COFPage", "COFRootPage"]
@@ -127,7 +127,7 @@ class COFActuPage(RoutablePageMixin, Page):
     all_day = models.BooleanField("Toute la journée", default=False, blank=True)
 
     content_panels = Page.content_panels + [
-        ImageChooserPanel("image"),
+        FieldPanel("image"),
         FieldPanel("chapo"),
         FieldPanel("body", classname="full"),
         FieldPanel("is_event"),
@@ -204,6 +204,7 @@ class COFDirectoryEntryPage(Page):
             ),
         ],
         blank=True,
+        use_json_field=True,
     )
 
     image = models.ForeignKey(
@@ -216,9 +217,9 @@ class COFDirectoryEntryPage(Page):
     )
 
     content_panels = Page.content_panels + [
-        ImageChooserPanel("image"),
+        FieldPanel("image"),
         FieldPanel("body", classname="full"),
-        StreamFieldPanel("links"),
+        FieldPanel("links"),
     ]
 
     subpage_types = []

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 = [