cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity

Merge branch 'kerl/sitecof_clubs_optional_urls' into 'master'

Browse source 
Dans la description d'un club (ou d'un partenaire du COF), le link est optionel.

See merge request klub-dev-ens/gestioCOF!393
This commit is contained in:
Martin Pepin 2019-12-26 23:27:20 +01:00
parent d2ba9471da 2e4d7101ce
commit e13a5b0e60
3 changed files with 110 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -11,6 +11,7 @@ Liste des changements notables dans GestioCOF depuis la version 0.1 (septembre
## Upcoming
- Nouveau site du COF : les liens sont optionnels dans les descriptions de clubs
- Mise à jour du lien vers le calendire de la K-Fêt sur la page d'accueil
- Certaines opérations sont à nouveau accessibles depuis la session partagée
K-Fêt.

107
gestioncof/cms/migrations/0003_directory_entry_optional_links.py Normal file
View file

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

3
gestioncof/cms/models.py
View file

@ -182,7 +182,8 @@ class COFDirectoryEntryPage(Page):
]
),
),
]
],
blank=True,
)
image = models.ForeignKey(