From 59317f9a423750734e96e132e89e1b065c8b3f7b Mon Sep 17 00:00:00 2001 From: Gwendolyn Date: Sat, 6 Jan 2024 18:51:04 +0100 Subject: [PATCH] oops forgot to remove the color field on line obstacles --- src/c3nav/mapdata/migrations/0101_remove_obstacle_color.py | 6 +++++- src/c3nav/mapdata/models/geometry/space.py | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/c3nav/mapdata/migrations/0101_remove_obstacle_color.py b/src/c3nav/mapdata/migrations/0101_remove_obstacle_color.py index a32805ac..48623d50 100644 --- a/src/c3nav/mapdata/migrations/0101_remove_obstacle_color.py +++ b/src/c3nav/mapdata/migrations/0101_remove_obstacle_color.py @@ -13,5 +13,9 @@ class Migration(migrations.Migration): migrations.RemoveField( model_name='obstacle', name='color', - ) + ), + migrations.RemoveField( + model_name='lineobstacle', + name='color', + ), ] diff --git a/src/c3nav/mapdata/models/geometry/space.py b/src/c3nav/mapdata/models/geometry/space.py index 02386d3f..127da3d7 100644 --- a/src/c3nav/mapdata/models/geometry/space.py +++ b/src/c3nav/mapdata/models/geometry/space.py @@ -197,9 +197,11 @@ class ObstacleGroup(TitledMixin, models.Model): self.register_changed_geometries() super().delete(*args, **kwargs) - def register_changed_geometries(self, do_query=True): + def register_changed_geometries(self): for obj in self.obstacles.select_related('space'): obj.register_change(force=True) + for obj in self.lineobstacles.select_related('space'): + obj.register_change(force=True) class Obstacle(SpaceGeometryMixin, models.Model): @@ -252,8 +254,6 @@ class LineObstacle(SpaceGeometryMixin, models.Model): validators=[MinValueValidator(Decimal('0'))]) altitude = models.DecimalField(_('altitude above ground'), max_digits=6, decimal_places=2, default=0, validators=[MinValueValidator(Decimal('0'))]) - color = models.CharField(null=True, blank=True, max_length=32, verbose_name=_('color (optional)')) - # TODO: migrate away from color same as for Obstacle class Meta: verbose_name = _('Line Obstacle')