From a2ef251252a625db05727ec306518f01af00cca7 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Tue, 28 Jun 2022 22:01:04 +0200 Subject: [PATCH] Update django version --- bda/migrations/0019_auto_20220628_1621.py | 76 ++++++++++ bda/templates/bda-attrib.html | 2 +- bda/templates/bda/etat-places.html | 2 +- bda/templates/bda/inscription-tirage.html | 2 +- bda/templates/bda/participants.html | 2 +- .../bda/revente/confirm-shotgun.html | 2 +- bda/templates/bda/revente/confirmed.html | 2 +- bda/templates/bda/revente/mail-success.html | 2 +- bda/templates/bda/revente/manage.html | 2 +- bda/templates/bda/revente/subscribe.html | 2 +- bda/templates/bda/revente/tirages.html | 2 +- bda/templates/spectacle_list.html | 2 +- bds/migrations/0007_alter_bdsprofile_id.py | 20 +++ bds/templates/bds/base.html | 2 +- clubs/migrations/0002_alter_club_id.py | 20 +++ events/migrations/0005_auto_20220628_1621.py | 55 +++++++ gestioasso/settings/cof_prod.py | 1 - gestioasso/settings/common.py | 1 + .../migrations/0019_auto_20220628_1621.py | 139 ++++++++++++++++++ gestioncof/templates/base.html | 2 +- gestioncof/templates/registration.html | 2 +- gestioncof/templates/tristate_js.html | 2 +- .../0004_alter_genericteamtoken_id.py | 20 +++ kfet/cms/hooks.py | 2 +- .../migrations/0003_alter_memberteam_id.py | 20 +++ kfet/migrations/0081_auto_20220628_1621.py | 125 ++++++++++++++++ kfet/templates/kfet/account_create.html | 2 +- .../kfet/account_create_special.html | 2 +- kfet/templates/kfet/account_group_form.html | 2 +- kfet/templates/kfet/account_read.html | 2 +- kfet/templates/kfet/article_read.html | 2 +- kfet/templates/kfet/history.html | 2 +- kfet/templates/kfet/home.html | 2 +- kfet/templates/kfet/kpsul.html | 2 +- kfet/templates/kfet/transfers.html | 4 +- kfet/templates/kfet/transfers_create.html | 2 +- .../templates/petitscours/demande_detail.html | 2 +- .../templates/petitscours/demande_list.html | 2 +- .../petitscours/details_demande_infos.html | 2 +- .../templates/petitscours/inscription.html | 2 +- .../traitement_demande_autre_niveau.html | 2 +- requirements.txt | 14 +- 42 files changed, 515 insertions(+), 40 deletions(-) create mode 100644 bda/migrations/0019_auto_20220628_1621.py create mode 100644 bds/migrations/0007_alter_bdsprofile_id.py create mode 100644 clubs/migrations/0002_alter_club_id.py create mode 100644 events/migrations/0005_auto_20220628_1621.py create mode 100644 gestioncof/migrations/0019_auto_20220628_1621.py create mode 100644 kfet/auth/migrations/0004_alter_genericteamtoken_id.py create mode 100644 kfet/cms/migrations/0003_alter_memberteam_id.py create mode 100644 kfet/migrations/0081_auto_20220628_1621.py diff --git a/bda/migrations/0019_auto_20220628_1621.py b/bda/migrations/0019_auto_20220628_1621.py new file mode 100644 index 00000000..3b5d3f2f --- /dev/null +++ b/bda/migrations/0019_auto_20220628_1621.py @@ -0,0 +1,76 @@ +# Generated by Django 3.2.13 on 2022-06-28 14:21 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("bda", "0018_auto_20201021_1818"), + ] + + operations = [ + migrations.AlterField( + model_name="attribution", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="categoriespectacle", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="choixspectacle", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="participant", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="quote", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="salle", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="spectacle", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="spectaclerevente", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="tirage", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + ] diff --git a/bda/templates/bda-attrib.html b/bda/templates/bda-attrib.html index fac0de67..057cacb4 100644 --- a/bda/templates/bda-attrib.html +++ b/bda/templates/bda-attrib.html @@ -1,5 +1,5 @@ {% extends "base_title.html" %} -{% load staticfiles %} +{% load static %} {% block extra_head %} diff --git a/bda/templates/bda/etat-places.html b/bda/templates/bda/etat-places.html index 401cc856..d1af0667 100644 --- a/bda/templates/bda/etat-places.html +++ b/bda/templates/bda/etat-places.html @@ -1,5 +1,5 @@ {% extends "base_title.html" %} -{% load staticfiles %} +{% load static %} {% block realcontent %}

État des inscriptions BdA

diff --git a/bda/templates/bda/inscription-tirage.html b/bda/templates/bda/inscription-tirage.html index 3f8091df..1eecd7af 100644 --- a/bda/templates/bda/inscription-tirage.html +++ b/bda/templates/bda/inscription-tirage.html @@ -1,5 +1,5 @@ {% extends "base_title.html" %} -{% load staticfiles %} +{% load static %} {% block extra_head %} diff --git a/bda/templates/bda/participants.html b/bda/templates/bda/participants.html index 4ab2d1f7..c99e5182 100644 --- a/bda/templates/bda/participants.html +++ b/bda/templates/bda/participants.html @@ -1,5 +1,5 @@ {% extends "base_title.html" %} -{% load staticfiles %} +{% load static %} {% block realcontent %}

{{ spectacle }}

diff --git a/bda/templates/bda/revente/confirm-shotgun.html b/bda/templates/bda/revente/confirm-shotgun.html index d7614c25..bf8dccba 100644 --- a/bda/templates/bda/revente/confirm-shotgun.html +++ b/bda/templates/bda/revente/confirm-shotgun.html @@ -1,5 +1,5 @@ {% extends "base_title.html" %} -{% load staticfiles %} +{% load static %} {%block realcontent %} diff --git a/bda/templates/bda/revente/confirmed.html b/bda/templates/bda/revente/confirmed.html index 780330bd..6f8ee583 100644 --- a/bda/templates/bda/revente/confirmed.html +++ b/bda/templates/bda/revente/confirmed.html @@ -1,5 +1,5 @@ {% extends "base_title.html" %} -{% load staticfiles %} +{% load static %} {% block realcontent %}

Inscription à une revente

diff --git a/bda/templates/bda/revente/mail-success.html b/bda/templates/bda/revente/mail-success.html index 5e970eb7..6340a451 100644 --- a/bda/templates/bda/revente/mail-success.html +++ b/bda/templates/bda/revente/mail-success.html @@ -1,5 +1,5 @@ {% extends "base_title.html" %} -{% load staticfiles %} +{% load static %} {% block realcontent %} diff --git a/bda/templates/bda/revente/manage.html b/bda/templates/bda/revente/manage.html index cd09f997..c42e0203 100644 --- a/bda/templates/bda/revente/manage.html +++ b/bda/templates/bda/revente/manage.html @@ -1,5 +1,5 @@ {% extends "base_title.html" %} -{% load staticfiles %} +{% load static %} {% block realcontent %} diff --git a/bda/templates/bda/revente/subscribe.html b/bda/templates/bda/revente/subscribe.html index e0a7176c..c91fff15 100644 --- a/bda/templates/bda/revente/subscribe.html +++ b/bda/templates/bda/revente/subscribe.html @@ -1,5 +1,5 @@ {% extends "base_title.html" %} -{% load staticfiles%} +{% load static %} {% block realcontent %}

Inscriptions pour BdA-Revente

diff --git a/bda/templates/bda/revente/tirages.html b/bda/templates/bda/revente/tirages.html index 4d9ac126..6ef55e03 100644 --- a/bda/templates/bda/revente/tirages.html +++ b/bda/templates/bda/revente/tirages.html @@ -1,5 +1,5 @@ {% extends "base_title.html" %} -{% load staticfiles %} +{% load static %} {% block realcontent %} diff --git a/bda/templates/spectacle_list.html b/bda/templates/spectacle_list.html index 4539d730..1ffd7cc3 100644 --- a/bda/templates/spectacle_list.html +++ b/bda/templates/spectacle_list.html @@ -1,5 +1,5 @@ {% extends "base_title.html" %} -{% load staticfiles %} +{% load static %} {% block extra_head %} diff --git a/bds/migrations/0007_alter_bdsprofile_id.py b/bds/migrations/0007_alter_bdsprofile_id.py new file mode 100644 index 00000000..7da58ca3 --- /dev/null +++ b/bds/migrations/0007_alter_bdsprofile_id.py @@ -0,0 +1,20 @@ +# Generated by Django 3.2.13 on 2022-06-28 14:21 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("bds", "0006_bdsprofile_comments"), + ] + + operations = [ + migrations.AlterField( + model_name="bdsprofile", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + ] diff --git a/bds/templates/bds/base.html b/bds/templates/bds/base.html index f456f6dc..74759e88 100644 --- a/bds/templates/bds/base.html +++ b/bds/templates/bds/base.html @@ -1,4 +1,4 @@ -{% load staticfiles %} +{% load static %} {% load bulma_utils %} diff --git a/clubs/migrations/0002_alter_club_id.py b/clubs/migrations/0002_alter_club_id.py new file mode 100644 index 00000000..cbcb1014 --- /dev/null +++ b/clubs/migrations/0002_alter_club_id.py @@ -0,0 +1,20 @@ +# Generated by Django 3.2.13 on 2022-06-28 14:21 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("clubs", "0001_initial"), + ] + + operations = [ + migrations.AlterField( + model_name="club", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + ] diff --git a/events/migrations/0005_auto_20220628_1621.py b/events/migrations/0005_auto_20220628_1621.py new file mode 100644 index 00000000..f7dd6513 --- /dev/null +++ b/events/migrations/0005_auto_20220628_1621.py @@ -0,0 +1,55 @@ +# Generated by Django 3.2.13 on 2022-06-28 14:21 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("events", "0004_unique_constraints"), + ] + + operations = [ + migrations.AlterField( + model_name="event", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="extrafield", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="extrafieldcontent", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="option", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="optionchoice", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="registration", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + ] diff --git a/gestioasso/settings/cof_prod.py b/gestioasso/settings/cof_prod.py index c239ea0c..3e976952 100644 --- a/gestioasso/settings/cof_prod.py +++ b/gestioasso/settings/cof_prod.py @@ -85,7 +85,6 @@ MIDDLEWARE = ( + MIDDLEWARE + [ "djconfig.middleware.DjConfigMiddleware", - "wagtail.core.middleware.SiteMiddleware", "wagtail.contrib.redirects.middleware.RedirectMiddleware", ] ) diff --git a/gestioasso/settings/common.py b/gestioasso/settings/common.py index cabe7000..44a1592b 100644 --- a/gestioasso/settings/common.py +++ b/gestioasso/settings/common.py @@ -111,6 +111,7 @@ DATABASES = { SITE_ID = 1 +DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" # --- # Internationalization diff --git a/gestioncof/migrations/0019_auto_20220628_1621.py b/gestioncof/migrations/0019_auto_20220628_1621.py new file mode 100644 index 00000000..0163eb04 --- /dev/null +++ b/gestioncof/migrations/0019_auto_20220628_1621.py @@ -0,0 +1,139 @@ +# Generated by Django 3.2.13 on 2022-06-28 14:21 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("gestioncof", "0018_petitscours_email"), + ] + + operations = [ + migrations.AlterField( + model_name="calendarsubscription", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="club", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="cofprofile", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="event", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="eventcommentfield", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="eventcommentvalue", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="eventoption", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="eventoptionchoice", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="eventregistration", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="petitcoursability", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="petitcoursattribution", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="petitcoursattributioncounter", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="petitcoursdemande", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="petitcourssubject", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="survey", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="surveyanswer", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="surveyquestion", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="surveyquestionanswer", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + ] diff --git a/gestioncof/templates/base.html b/gestioncof/templates/base.html index d313ee9d..7020e3c5 100644 --- a/gestioncof/templates/base.html +++ b/gestioncof/templates/base.html @@ -1,4 +1,4 @@ -{% load staticfiles %} +{% load static %} diff --git a/gestioncof/templates/registration.html b/gestioncof/templates/registration.html index 2ef997e1..9807afde 100644 --- a/gestioncof/templates/registration.html +++ b/gestioncof/templates/registration.html @@ -1,5 +1,5 @@ {% extends "base_title.html" %} -{% load staticfiles %} +{% load static %} {% block page_size %}col-sm-8{% endblock %} diff --git a/gestioncof/templates/tristate_js.html b/gestioncof/templates/tristate_js.html index af906ebe..6b5312a8 100644 --- a/gestioncof/templates/tristate_js.html +++ b/gestioncof/templates/tristate_js.html @@ -1,4 +1,4 @@ -{% load staticfiles %} +{% load static %} diff --git a/kfet/templates/kfet/history.html b/kfet/templates/kfet/history.html index 100e0825..9deeefae 100644 --- a/kfet/templates/kfet/history.html +++ b/kfet/templates/kfet/history.html @@ -1,5 +1,5 @@ {% extends 'kfet/base_col_2.html' %} -{% load l10n staticfiles widget_tweaks bootstrap %} +{% load l10n static widget_tweaks bootstrap %} {% block extra_head %} diff --git a/kfet/templates/kfet/home.html b/kfet/templates/kfet/home.html index e5175dc3..8704bbe9 100644 --- a/kfet/templates/kfet/home.html +++ b/kfet/templates/kfet/home.html @@ -1,5 +1,5 @@ {% extends "kfet/base_col_1.html" %} -{% load staticfiles %} +{% load static %} {% load kfet_tags %} {% block title %}Accueil{% endblock %} diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html index a89c4072..b67e298d 100644 --- a/kfet/templates/kfet/kpsul.html +++ b/kfet/templates/kfet/kpsul.html @@ -1,5 +1,5 @@ {% extends 'kfet/base.html' %} -{% load staticfiles %} +{% load static %} {% block extra_head %} diff --git a/kfet/templates/kfet/transfers.html b/kfet/templates/kfet/transfers.html index f8bef33d..e9ee16b0 100644 --- a/kfet/templates/kfet/transfers.html +++ b/kfet/templates/kfet/transfers.html @@ -1,6 +1,6 @@ {% extends 'kfet/base_col_2.html' %} -{% load staticfiles %} -{% load l10n staticfiles widget_tweaks %} +{% load static %} +{% load l10n static widget_tweaks %} {% block title %}Transferts{% endblock %} {% block header-title %}Transferts{% endblock %} diff --git a/kfet/templates/kfet/transfers_create.html b/kfet/templates/kfet/transfers_create.html index fc429d97..3a85264d 100644 --- a/kfet/templates/kfet/transfers_create.html +++ b/kfet/templates/kfet/transfers_create.html @@ -1,5 +1,5 @@ {% extends "kfet/base_col_1.html" %} -{% load staticfiles %} +{% load static %} {% block extra_head %} diff --git a/petitscours/templates/petitscours/demande_detail.html b/petitscours/templates/petitscours/demande_detail.html index d7f9ca8b..8711fcda 100644 --- a/petitscours/templates/petitscours/demande_detail.html +++ b/petitscours/templates/petitscours/demande_detail.html @@ -1,5 +1,5 @@ {% extends "petitscours/base_title.html" %} -{% load staticfiles %} +{% load static %} {% block page_size %}col-sm-8{% endblock %} diff --git a/petitscours/templates/petitscours/demande_list.html b/petitscours/templates/petitscours/demande_list.html index e4c3c782..04132d57 100644 --- a/petitscours/templates/petitscours/demande_list.html +++ b/petitscours/templates/petitscours/demande_list.html @@ -1,5 +1,5 @@ {% extends "petitscours/base_title.html" %} -{% load staticfiles %} +{% load static %} {% block realcontent %}

Demandes de petits cours

diff --git a/petitscours/templates/petitscours/details_demande_infos.html b/petitscours/templates/petitscours/details_demande_infos.html index 39cee1d3..42f37d56 100644 --- a/petitscours/templates/petitscours/details_demande_infos.html +++ b/petitscours/templates/petitscours/details_demande_infos.html @@ -1,4 +1,4 @@ -{% load staticfiles %} +{% load static %} diff --git a/petitscours/templates/petitscours/inscription.html b/petitscours/templates/petitscours/inscription.html index 9512e0b3..eaf10524 100644 --- a/petitscours/templates/petitscours/inscription.html +++ b/petitscours/templates/petitscours/inscription.html @@ -1,5 +1,5 @@ {% extends "base_title.html" %} -{% load staticfiles %} +{% load static %} {% block extra_head %} diff --git a/petitscours/templates/petitscours/traitement_demande_autre_niveau.html b/petitscours/templates/petitscours/traitement_demande_autre_niveau.html index cb3ec379..c10c8aaf 100644 --- a/petitscours/templates/petitscours/traitement_demande_autre_niveau.html +++ b/petitscours/templates/petitscours/traitement_demande_autre_niveau.html @@ -1,5 +1,5 @@ {% extends "petitscours/base_title.html" %} -{% load staticfiles %} +{% load static %} {% block realcontent %}

diff --git a/requirements.txt b/requirements.txt index b4594ce3..b538a1ee 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,12 @@ -Django==2.2.* +Django==3.2.* Pillow==7.2.0 -authens==0.1b0 +authens==0.1b4 channels==2.4.* configparser==3.5.0 -django-autocomplete-light==3.3.* +django-autocomplete-light==3.9.* django-bootstrap-form==3.3 -django-cas-ng==3.6.* -django-cors-headers==2.2.0 +django-cas-ng==4.3.* +django-cors-headers==3.13.0 django-djconfig==0.8.0 django-hCaptcha==0.1.0 django-js-reverse==0.9.1 @@ -14,6 +14,6 @@ django-widget-tweaks==1.4.1 icalendar==4.0.7 python-dateutil==2.8.1 statistics==1.0.3.5 -wagtail-modeltranslation==0.10.* -wagtail==2.7.* +wagtail-modeltranslation==0.11.* +wagtail==2.13.* wagtailmenus==3.0.*

Date {{ demande.created }}
Nom/prénom {{ demande.name }}