entrouvert
/
authentic2-cut
16
0
Fork 0
Code Issues Pull Requests Releases Activity

dj22: add on_delete attribute to FK

This commit is contained in:
Benjamin Dauvergne 2020-05-15 16:01:30 +02:00
parent a5e4d42e02
commit 15daeea356
5 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/authentic2_cut/migrations/0001_initial.py
View File

@ -18,8 +18,8 @@ class Migration(migrations.Migration):
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('timestamp', models.DateTimeField(auto_now_add=True, verbose_name='Horodatage', db_index=True)),
('message', models.TextField(verbose_name=b'Message')),
('actor', models.ForeignKey(related_name='actor_journal', verbose_name='Auteur', to=settings.AUTH_USER_MODEL)),
('subject', models.ForeignKey(related_name='subject_journal', verbose_name=b'Sujet', to=settings.AUTH_USER_MODEL)),
('actor', models.ForeignKey(related_name='actor_journal', verbose_name='Auteur', to=settings.AUTH_USER_MODEL, on_delete=models.SET_NULL)),
('subject', models.ForeignKey(related_name='subject_journal', verbose_name=b'Sujet', to=settings.AUTH_USER_MODEL, on_delete=models.SET_NULL)),
],
options={
'ordering': ('-timestamp', '-id'),

2
src/authentic2_cut/migrations/0002_auto_20171116_1052.py
View File

@ -15,6 +15,6 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='journal',
name='subject',
field=models.ForeignKey(related_name='subject_journal', verbose_name=b'Sujet', to=settings.AUTH_USER_MODEL, null=True),
field=models.ForeignKey(related_name='subject_journal', verbose_name=b'Sujet', to=settings.AUTH_USER_MODEL, null=True, on_delete=models.SET_NULL),
),
]

10
src/authentic2_cut/migrations/0003_auto_20180423_1532.py
View File

@ -25,10 +25,10 @@ class Migration(migrations.Migration):
('validated', models.DateTimeField(null=True, verbose_name='Date de validation')),
('external_id', models.TextField(null=True, verbose_name='Identifiant externe', blank=True)),
('taken', models.DateTimeField(null=True, verbose_name='En cours')),
('origin_ct', models.ForeignKey(verbose_name=b'origin ct', to='contenttypes.ContentType')),
('taken_by', models.ForeignKey(related_name='validation_requests_taken', verbose_name='Trait\xe9 par', to=settings.AUTH_USER_MODEL, null=True)),
('user', models.ForeignKey(related_name='validation_requests', verbose_name='Utilisateur', to=settings.AUTH_USER_MODEL)),
('validated_by', models.ForeignKey(related_name='validation_requests_validated', verbose_name='Valid\xe9/refus\xe9 par', to=settings.AUTH_USER_MODEL, null=True)),
('origin_ct', models.ForeignKey(verbose_name=b'origin ct', to='contenttypes.ContentType', on_delete=models.CASCADE)),
('taken_by', models.ForeignKey(related_name='validation_requests_taken', verbose_name='Trait\xe9 par', to=settings.AUTH_USER_MODEL, null=True, on_delete=models.SET_NULL)),
('user', models.ForeignKey(related_name='validation_requests', verbose_name='Utilisateur', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
('validated_by', models.ForeignKey(related_name='validation_requests_validated', verbose_name='Valid\xe9/refus\xe9 par', to=settings.AUTH_USER_MODEL, null=True, on_delete=models.SET_NULL)),
],
options={
'ordering': ('-created',),
@ -41,7 +41,7 @@ class Migration(migrations.Migration):
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('image', models.ImageField(upload_to=b'', verbose_name=b'contenu')),
('validation_request', models.ForeignKey(related_name='attachments', verbose_name='requ\xeate de validation', to='authentic2_cut.ValidationRequest')),
('validation_request', models.ForeignKey(related_name='attachments', verbose_name='requ\xeate de validation', to='authentic2_cut.ValidationRequest', on_delete=models.CASCADE)),
],
options={
'ordering': ('pk',),

2
src/authentic2_cut/migrations/0004_auto_20180801_1147.py
View File

@ -25,6 +25,6 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='validationrequest',
name='validated_by',
field=models.ForeignKey(related_name='validation_requests_validated', verbose_name='Valid\xe9/refus\xe9 par', blank=True, to=settings.AUTH_USER_MODEL, null=True),
field=models.ForeignKey(related_name='validation_requests_validated', verbose_name='Valid\xe9/refus\xe9 par', blank=True, to=settings.AUTH_USER_MODEL, null=True, on_delete=models.SET_NULL),
),
]

21
src/authentic2_cut/models.py
View File

@ -26,12 +26,14 @@ class Journal(models.Model):
actor = models.ForeignKey(
settings.AUTH_USER_MODEL,
verbose_name=u'Auteur',
related_name='actor_journal')
related_name='actor_journal',
on_delete=models.SET_NULL)
subject = models.ForeignKey(
settings.AUTH_USER_MODEL,
verbose_name='Sujet',
null=True,
related_name='subject_journal')
related_name='subject_journal',
on_delete=models.SET_NULL)
message = models.TextField(
verbose_name='Message')
@ -108,14 +110,16 @@ class ValidationRequest(models.Model):
auto_now_add=True)
origin_ct = models.ForeignKey(
'contenttypes.ContentType',
verbose_name='origin ct')
verbose_name='origin ct',
on_delete=models.CASCADE)
origin_id = models.PositiveIntegerField(
verbose_name='origin id')
origin = GenericForeignKey('origin_ct', 'origin_id')
user = models.ForeignKey(
settings.AUTH_USER_MODEL,
verbose_name=u'Utilisateur',
related_name='validation_requests')
related_name='validation_requests',
on_delete=models.CASCADE)
status = models.CharField(
max_length=16,
choices=STATUS_CHOICES,
@ -134,7 +138,8 @@ class ValidationRequest(models.Model):
verbose_name=u'Validé/refusé par',
null=True,
blank=True,
related_name='validation_requests_validated')
related_name='validation_requests_validated',
on_delete=models.SET_NULL)
external_id = models.TextField(
blank=True,
null=True,
@ -146,7 +151,8 @@ class ValidationRequest(models.Model):
settings.AUTH_USER_MODEL,
verbose_name=u'Traité par',
null=True,
related_name='validation_requests_taken')
related_name='validation_requests_taken',
on_delete=models.SET_NULL)
objects = ValidationRequestManager()
@ -203,7 +209,8 @@ class ValidationRequestAttachment(models.Model):
validation_request = models.ForeignKey(
ValidationRequest,
verbose_name=u'requête de validation',
related_name='attachments')
related_name='attachments',
on_delete=models.CASCADE)
image = models.ImageField(
verbose_name='contenu')