diff --git a/aleksis/apps/chronos/migrations/0009_automaticplan.py b/aleksis/apps/chronos/migrations/0009_automaticplan.py index 26c97bb0133ea14814c279c598c81f04fe196ef6..573c87450c0e67d512b3024986e75fc0eb42d681 100644 --- a/aleksis/apps/chronos/migrations/0009_automaticplan.py +++ b/aleksis/apps/chronos/migrations/0009_automaticplan.py @@ -20,8 +20,7 @@ class Migration(migrations.Migration): ('livedocument_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='resint.livedocument')), ('number_of_days', models.PositiveIntegerField(default=1, validators=[django.core.validators.MinValueValidator(1)], verbose_name='Number of days shown in the plan')), ('show_header_box', models.BooleanField(default=True, help_text='The header box shows affected teachers/groups.', verbose_name='Show header box')), - ('last_update_triggered_manually', models.BooleanField(default=False, verbose_name='Was the last update triggered manually?', editable=False)), - ('last_revision', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='reversion.revision', verbose_name='Revision which triggered the last update', editable=False)), + ('last_substitutions_revision', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='reversion.revision', verbose_name='Revision which triggered the last update', editable=False)), ], options={ 'verbose_name': 'Automatic plan', diff --git a/aleksis/apps/chronos/models.py b/aleksis/apps/chronos/models.py index 335e2bcf3dfffdaac9f8f0ab7f4d415ab8e7fd70..153979593ecbfef269f78b2dcf68db4ef79ce3b4 100644 --- a/aleksis/apps/chronos/models.py +++ b/aleksis/apps/chronos/models.py @@ -1136,7 +1136,7 @@ class AutomaticPlan(LiveDocument): verbose_name=_("Show header box"), help_text=_("The header box shows affected teachers/groups."), ) - last_revision = models.ForeignKey( + last_substitutions_revision = models.ForeignKey( to=Revision, on_delete=models.SET_NULL, blank=True, @@ -1145,10 +1145,6 @@ class AutomaticPlan(LiveDocument): editable=False, ) - last_update_triggered_manually = models.BooleanField( - default=False, verbose_name=_("Was the last update triggered manually?"), editable=False - ) - @property def current_start_day(self) -> date: """Get first day which should be shown in the PDF.""" @@ -1174,9 +1170,9 @@ class AutomaticPlan(LiveDocument): def check_update(self, revision: Revision, versions: Iterable[Version]): """Check if the PDF file has to be updated and do the update then.""" - if not self.last_revision or ( - self.last_revision != revision - and revision.date_created > self.last_revision.date_created + if not self.last_substitutions_revision or ( + self.last_substitutions_revision != revision + and revision.date_created > self.last_substitutions_revision.date_created ): update = False for version in versions: @@ -1192,7 +1188,7 @@ class AutomaticPlan(LiveDocument): if update: self.update(triggered_manually=False) - self.last_revision = revision + self.last_substitutions_revision = revision self.save() def update(self, triggered_manually: bool = True):