2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

remove compiled_room and compiled_area, create location group categories

Browse source
This commit is contained in:
Laura Klünder 2017-07-11 18:01:48 +02:00
parent 5d336d218a
commit ca237d7884
2 changed files with 44 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/c3nav/mapdata/models/locations.py
View file

@ -123,16 +123,10 @@ class Location(LocationSlug, TitledMixin, models.Model):
# dont filter in the query here so prefetch_related works
if instance is None:
instance = self
groups = [group for group in instance.groups.all() if group.color]
if not groups:
return None
for group in groups:
if group.compiled_area:
for group in instance.groups.all():
if group.color:
return group.color
for group in groups:
if group.compiled_room:
return group.color
return groups[0].color
return None
class SpecificLocation(Location, models.Model):
@ -177,8 +171,6 @@ class LocationGroupCategory(TitledMixin, models.Model):
class LocationGroup(Location, models.Model):
category = models.ForeignKey(LocationGroupCategory, related_name='groups', on_delete=models.PROTECT,
verbose_name=_('Category'))
compiled_room = models.BooleanField(default=False, verbose_name=_('is a compiled room'))
compiled_area = models.BooleanField(default=False, verbose_name=_('is a compiled area'))
priority = models.IntegerField(default=0, db_index=True)
class Meta: