DGNum/gestioCOF
16
2
Fork 2
Code Issues 78 Pull requests 15 Projects Releases 12 Packages Wiki Activity

Update django version

Browse source
This commit is contained in:
Tom Hubrecht 2022-06-28 22:01:04 +02:00 committed by thubrecht
parent 071c810605
commit 1ac47885d0
42 changed files with 515 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
bda/migrations/0019_auto_20220628_1621.py Normal file
View file

@ -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"
),
),
]

2
bda/templates/bda-attrib.html
View file

@ -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" %}" />

2
bda/templates/bda/etat-places.html
View file

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

2
bda/templates/bda/inscription-tirage.html
View file

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

2
bda/templates/bda/participants.html
View file

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

2
bda/templates/bda/revente/confirm-shotgun.html
View file

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

2
bda/templates/bda/revente/confirmed.html
View file

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

2
bda/templates/bda/revente/mail-success.html
View file

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

2
bda/templates/bda/revente/manage.html
View file

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

2
bda/templates/bda/revente/subscribe.html
View file

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

2
bda/templates/bda/revente/tirages.html
View file

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

2
bda/templates/spectacle_list.html
View file

@ -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" %}" />

20
bds/migrations/0007_alter_bdsprofile_id.py Normal file
View file

@ -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"
),
),
]

2
bds/templates/bds/base.html
View file

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

20
clubs/migrations/0002_alter_club_id.py Normal file
View file

@ -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"
),
),
]

55
events/migrations/0005_auto_20220628_1621.py Normal file
View file

@ -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"
),
),
]

1
gestioasso/settings/cof_prod.py
View file

@ -85,7 +85,6 @@ MIDDLEWARE = (
+ MIDDLEWARE
+ [
"djconfig.middleware.DjConfigMiddleware",
"wagtail.core.middleware.SiteMiddleware",
"wagtail.contrib.redirects.middleware.RedirectMiddleware",
]
)

1
gestioasso/settings/common.py
View file

@ -111,6 +111,7 @@ DATABASES = {
SITE_ID = 1
DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
# ---
# Internationalization

139
gestioncof/migrations/0019_auto_20220628_1621.py Normal file
View file

@ -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"
),
),
]

2
gestioncof/templates/base.html
View file

@ -1,4 +1,4 @@
{% load staticfiles %}
{% load static %}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="fr">

2
gestioncof/templates/registration.html
View file

@ -1,5 +1,5 @@
{% extends "base_title.html" %}
{% load staticfiles %}
{% load static %}
{% block page_size %}col-sm-8{% endblock %}

2
gestioncof/templates/tristate_js.html
View file

@ -1,4 +1,4 @@
{% load staticfiles %}
{% load static %}
<script type="text/javascript">
var supernifty_tristate = function() {
var

20
kfet/auth/migrations/0004_alter_genericteamtoken_id.py Normal file
View file

@ -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 = [
("kfetauth", "0003_existing_groups"),
]
operations = [
migrations.AlterField(
model_name="genericteamtoken",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
]

2
kfet/cms/hooks.py
View file

@ -1,4 +1,4 @@
from django.contrib.staticfiles.templatetags.staticfiles import static
from django.templatetags.static import static
from django.utils.html import format_html
from wagtail.core import hooks

20
kfet/cms/migrations/0003_alter_memberteam_id.py Normal file
View file

@ -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 = [
("kfetcms", "0002_alter_kfetpage_colcount"),
]
operations = [
migrations.AlterField(
model_name="memberteam",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
]

125
kfet/migrations/0081_auto_20220628_1621.py Normal file
View file

@ -0,0 +1,125 @@
# Generated by Django 3.2.13 on 2022-06-28 14:21
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("kfet", "0080_accountnegative_last_rappel"),
]
operations = [
migrations.AlterField(
model_name="account",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.AlterField(
model_name="accountnegative",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.AlterField(
model_name="article",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.AlterField(
model_name="articlecategory",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.AlterField(
model_name="checkout",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.AlterField(
model_name="checkoutstatement",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.AlterField(
model_name="inventory",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.AlterField(
model_name="inventoryarticle",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.AlterField(
model_name="operation",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.AlterField(
model_name="operationgroup",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.AlterField(
model_name="order",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.AlterField(
model_name="orderarticle",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.AlterField(
model_name="supplier",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.AlterField(
model_name="supplierarticle",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.AlterField(
model_name="transfer",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.AlterField(
model_name="transfergroup",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
]

2
kfet/templates/kfet/account_create.html
View file

@ -1,5 +1,5 @@
{% extends "kfet/base_form.html" %}
{% load staticfiles %}
{% load static %}
{% block title %}Nouveau compte{% endblock %}
{% block header-title %}Création d'un compte{% endblock %}

2
kfet/templates/kfet/account_create_special.html
View file

@ -1,5 +1,5 @@
{% extends "kfet/base.html" %}
{% load staticfiles %}
{% load static %}
{% block title %}Nouveau compte{% endblock %}
{% block header-title %}Création d'un compte{% endblock %}

2
kfet/templates/kfet/account_group_form.html
View file

@ -1,5 +1,5 @@
{% extends 'kfet/base_form.html' %}
{% load staticfiles %}
{% load static %}
{% load widget_tweaks %}
{% block title %}Permissions - Édition{% endblock %}

2
kfet/templates/kfet/account_read.html
View file

@ -1,5 +1,5 @@
{% extends "kfet/base_col_2.html" %}
{% load staticfiles %}
{% load static %}
{% load kfet_tags %}
{% load l10n %}

2
kfet/templates/kfet/article_read.html
View file

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

2
kfet/templates/kfet/history.html
View file

@ -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 %}
<link rel="stylesheet" type="text/css" href="{% static 'kfet/vendor/multiple-select/multiple-select.css' %}">

2
kfet/templates/kfet/home.html
View file

@ -1,5 +1,5 @@
{% extends "kfet/base_col_1.html" %}
{% load staticfiles %}
{% load static %}
{% load kfet_tags %}
{% block title %}Accueil{% endblock %}

2
kfet/templates/kfet/kpsul.html
View file

@ -1,5 +1,5 @@
{% extends 'kfet/base.html' %}
{% load staticfiles %}
{% load static %}
{% block extra_head %}
<link rel="stylesheet" style="text/css" href="{% static 'kfet/css/kpsul_grid.css' %}">

4
kfet/templates/kfet/transfers.html
View file

@ -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 %}

2
kfet/templates/kfet/transfers_create.html
View file

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

2
petitscours/templates/petitscours/demande_detail.html
View file

@ -1,5 +1,5 @@
{% extends "petitscours/base_title.html" %}
{% load staticfiles %}
{% load static %}
{% block page_size %}col-sm-8{% endblock %}

2
petitscours/templates/petitscours/demande_list.html
View file

@ -1,5 +1,5 @@
{% extends "petitscours/base_title.html" %}
{% load staticfiles %}
{% load static %}
{% block realcontent %}
<h2>Demandes de petits cours</h2>

2
petitscours/templates/petitscours/details_demande_infos.html
View file

@ -1,4 +1,4 @@
{% load staticfiles %}
{% load static %}
<table class="table table-striped">
<tr class="danger"><td><strong>Date</strong></td><td> {{ demande.created }}</td></tr>
<tr class="warning"><td><strong>Nom/prénom</strong></td><td> {{ demande.name }}</td></tr>

2
petitscours/templates/petitscours/inscription.html
View file

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

2
petitscours/templates/petitscours/traitement_demande_autre_niveau.html
View file

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

14
requirements.txt
View file

@ -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.*