Commit 7e1b9ab3 authored by Martin Lehoux's avatar Martin Lehoux

Merge branch 'back' into 'master'

Back

Closes #11

See merge request !26
parents 3d2f0ac6 08a83e44
# Generated by Django 2.0.6 on 2018-06-24 12:21
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('core', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='document',
name='type',
field=models.CharField(choices=[('Annale', 'Annale'), ('Fiche', 'Fiche'), ('Correction', 'Correction'), ('Poly de cours', 'Poly de cours'), ('Notes de cours', 'Notes de cours')], max_length=50, null=True),
),
migrations.AlterField(
model_name='user',
name='hasAcceptedCGU',
field=models.BooleanField(default=False, verbose_name="Conditions générales d'utilisation acceptées"),
),
migrations.AlterField(
model_name='user',
name='photoPath',
field=models.URLField(default=False, verbose_name='Lien vers la photo scolaire'),
),
migrations.AlterField(
model_name='user',
name='promo',
field=models.IntegerField(blank=True, null=True, verbose_name='Promotion'),
),
]
\ No newline at end of file
......@@ -42,7 +42,8 @@ class Document(models.Model):
('Annale','Annale'),
('Fiche','Fiche'),
('Correction','Correction'),
('Cours','Cours'),
('Poly de cours','Poly de cours'),
('Notes de cours', 'Notes de cours'),
),
null=True)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment