From d3cbcf391fa48a816d67a66e360a3c8dffa95ee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20P=C3=A9pin?= Date: Thu, 4 Jan 2018 23:43:10 +0100 Subject: [PATCH] Specify on_delete everywhere --- calendrier/migrations/0001_initial.py | 4 ++-- calendrier/models.py | 6 ++---- gestion/migrations/0001_initial.py | 12 ++++++++---- gestion/models.py | 2 +- partitions/migrations/0001_initial.py | 2 +- partitions/models.py | 2 +- propositions/migrations/0001_initial.py | 6 +++--- propositions/models.py | 11 ++++------- 8 files changed, 22 insertions(+), 23 deletions(-) diff --git a/calendrier/migrations/0001_initial.py b/calendrier/migrations/0001_initial.py index c0eb8f8..42840b3 100644 --- a/calendrier/migrations/0001_initial.py +++ b/calendrier/migrations/0001_initial.py @@ -36,8 +36,8 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, verbose_name='ID', serialize=False)), ('reponse', models.CharField(max_length=20, choices=[('oui', 'Oui'), ('non', 'Non'), ('pe', 'Peut-être')], default='non', verbose_name='Réponse')), ('details', models.CharField(blank=True, max_length=50)), - ('event', models.ForeignKey(to='calendrier.Event')), - ('participant', models.ForeignKey(to='gestion.ErnestoUser')), + ('event', models.ForeignKey(to='calendrier.Event', on_delete=models.CASCADE)), + ('participant', models.ForeignKey(to='gestion.ErnestoUser', on_delete=models.CASCADE)), ], ), ] diff --git a/calendrier/models.py b/calendrier/models.py index 96eb583..2a6cdda 100644 --- a/calendrier/models.py +++ b/calendrier/models.py @@ -33,10 +33,8 @@ class Event(models.Model): class Participants(models.Model): - event = models.ForeignKey(Event) - participant = models.ForeignKey(ErnestoUser) + event = models.ForeignKey(Event, on_delete=models.CASCADE) + participant = models.ForeignKey(ErnestoUser, on_delete=models.CASCADE) reponse = models.CharField("Réponse", max_length=20, default="non", choices=ANSWERS) details = models.CharField(max_length=50, blank=True) - -# Create your models here. diff --git a/gestion/migrations/0001_initial.py b/gestion/migrations/0001_initial.py index f95ea63..ff61978 100644 --- a/gestion/migrations/0001_initial.py +++ b/gestion/migrations/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models from django.conf import settings @@ -23,7 +20,14 @@ class Migration(migrations.Migration): ('slug', models.CharField(max_length=7, editable=False, unique=True)), ('doodlename', models.CharField(blank=True, max_length=30, verbose_name='Nom pour le doodle')), ('mails', models.BooleanField(verbose_name='Recevoir les mails', default=True)), - ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL, related_name='profile')), + ( + 'user', + models.OneToOneField( + to=settings.AUTH_USER_MODEL, + on_delete=models.CASCADE, + related_name='profile' + ) + ), ], options={ 'verbose_name': 'Profil Ernestophoniste', diff --git a/gestion/models.py b/gestion/models.py index b530a84..df21027 100644 --- a/gestion/models.py +++ b/gestion/models.py @@ -5,7 +5,7 @@ from django.contrib.auth.models import User class ErnestoUser(models.Model): - user = models.OneToOneField(User, related_name="profile") + user = models.OneToOneField(User, on_delete=models.CASCADE, related_name="profile") is_ernesto = models.BooleanField("Membre de l'Ernestophone", default=True) is_chef = models.BooleanField("Chef Fanfare", default=False) phone = models.CharField("Téléphone", max_length=20, blank=True) diff --git a/partitions/migrations/0001_initial.py b/partitions/migrations/0001_initial.py index e6f5aa3..af80c0a 100644 --- a/partitions/migrations/0001_initial.py +++ b/partitions/migrations/0001_initial.py @@ -31,6 +31,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='partition', name='morceau', - field=models.ForeignKey(to='partitions.PartitionSet'), + field=models.ForeignKey(to='partitions.PartitionSet', on_delete=models.CASCADE), ), ] diff --git a/partitions/models.py b/partitions/models.py index ec823d2..bacbf59 100644 --- a/partitions/models.py +++ b/partitions/models.py @@ -15,7 +15,7 @@ PARTITION_TYPES = ( class Partition(models.Model): nom = models.CharField(max_length=100) part = models.FileField(upload_to="partitions/") - morceau = models.ForeignKey('PartitionSet') + morceau = models.ForeignKey('PartitionSet', on_delete=models.CASCADE) def __str__(self): return self.nom diff --git a/propositions/migrations/0001_initial.py b/propositions/migrations/0001_initial.py index 5db2fc9..344f68c 100644 --- a/propositions/migrations/0001_initial.py +++ b/propositions/migrations/0001_initial.py @@ -20,7 +20,7 @@ class Migration(migrations.Migration): ('lien', models.URLField(blank=True)), ('nboui', models.IntegerField(verbose_name='oui', default=0)), ('nbnon', models.IntegerField(verbose_name='non', default=0)), - ('user', models.ForeignKey(verbose_name='Proposé par', to='gestion.ErnestoUser')), + ('user', models.ForeignKey(verbose_name='Proposé par', to='gestion.ErnestoUser', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Proposition', @@ -31,8 +31,8 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)), ('reponse', models.CharField(verbose_name='Réponse', choices=[('oui', 'Oui'), ('non', 'Non')], max_length=20, blank=True)), - ('part', models.ForeignKey(to='gestion.ErnestoUser')), - ('prop', models.ForeignKey(to='propositions.Prop')), + ('part', models.ForeignKey(to='gestion.ErnestoUser', on_delete=models.CASCADE)), + ('prop', models.ForeignKey(to='propositions.Prop', on_delete=models.CASCADE)), ], ), ] diff --git a/propositions/models.py b/propositions/models.py index edfc240..e1c350f 100644 --- a/propositions/models.py +++ b/propositions/models.py @@ -10,7 +10,7 @@ REP = ( class Prop(models.Model): nom = models.CharField(max_length=100) artiste = models.CharField(blank=True, max_length=100) - user = models.ForeignKey(ErnestoUser, verbose_name="Proposé par") + user = models.ForeignKey(ErnestoUser, on_delete=models.CASCADE, verbose_name="Proposé par") lien = models.URLField(blank=True) nboui = models.IntegerField(default=0, verbose_name="oui") nbnon = models.IntegerField(default=0, verbose_name="non") @@ -23,9 +23,6 @@ class Prop(models.Model): class Reponses(models.Model): - prop = models.ForeignKey(Prop) - part = models.ForeignKey(ErnestoUser) - reponse = models.CharField("Réponse", max_length=20, blank=True, - choices=REP) - -# Create your models here. + prop = models.ForeignKey(Prop, on_delete=models.CASCADE) + part = models.ForeignKey(ErnestoUser, on_delete=models.CASCADE) + reponse = models.CharField("Réponse", max_length=20, blank=True, choices=REP)