Skip to content
Snippets Groups Projects
Commit d6c5b38a authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch...

Merge branch '42-chronos-lessonsubstitution-teachers-fields-w340-null-has-no-effect-on-manytomanyfield' into 'master'

Resolve "chronos.LessonSubstitution.teachers: (fields.W340) null has no effect on ManyToManyField."

Closes #42

See merge request BiscuIT/BiscuIT-App-Chronos!23
parents c3dffaa6 614bb68f
No related branches found
No related tags found
1 merge request!23Resolve "chronos.LessonSubstitution.teachers: (fields.W340) null has no effect on ManyToManyField."
...@@ -90,7 +90,7 @@ class Migration(migrations.Migration): ...@@ -90,7 +90,7 @@ class Migration(migrations.Migration):
('room', models.ForeignKey(null=True, blank=True, on_delete=django.db.models.deletion.CASCADE, to='chronos.Room', verbose_name='Room')), ('room', models.ForeignKey(null=True, blank=True, on_delete=django.db.models.deletion.CASCADE, to='chronos.Room', verbose_name='Room')),
('school', models.ForeignKey(default=biscuit.core.util.core_helpers.get_current_school, on_delete=django.db.models.deletion.CASCADE, to='core.School')), ('school', models.ForeignKey(default=biscuit.core.util.core_helpers.get_current_school, on_delete=django.db.models.deletion.CASCADE, to='core.School')),
('subject', models.ForeignKey(null=True, blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='lesson_substitutions', to='chronos.Subject', verbose_name='Subject')), ('subject', models.ForeignKey(null=True, blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='lesson_substitutions', to='chronos.Subject', verbose_name='Subject')),
('teachers', models.ManyToManyField(null=True, blank=True, related_name='lesson_substitutions', to='core.Person')), ('teachers', models.ManyToManyField(blank=True, related_name='lesson_substitutions', to='core.Person')),
], ],
options={ options={
'ordering': ['lesson_period__lesson__date_start', 'week', 'lesson_period__period__weekday', 'lesson_period__period__period'], 'ordering': ['lesson_period__lesson__date_start', 'week', 'lesson_period__period__weekday', 'lesson_period__period__period'],
......
...@@ -267,7 +267,7 @@ class LessonSubstitution(SchoolRelated): ...@@ -267,7 +267,7 @@ class LessonSubstitution(SchoolRelated):
'Subject', on_delete=models.CASCADE, 'Subject', on_delete=models.CASCADE,
related_name='lesson_substitutions', null=True, blank=True, verbose_name=_('Subject')) related_name='lesson_substitutions', null=True, blank=True, verbose_name=_('Subject'))
teachers = models.ManyToManyField('core.Person', teachers = models.ManyToManyField('core.Person',
related_name='lesson_substitutions', blank=True, null=True) related_name='lesson_substitutions', blank=True)
room = models.ForeignKey('Room', models.CASCADE, null=True, blank=True, verbose_name=_('Room')) room = models.ForeignKey('Room', models.CASCADE, null=True, blank=True, verbose_name=_('Room'))
cancelled = models.BooleanField(default=False) cancelled = models.BooleanField(default=False)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment