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

fix get_color() on ModelInstanceWrapper

Browse source
This commit is contained in:
Laura Klünder 2017-06-16 18:38:41 +02:00
parent 8fef2a81a9
commit edfb083c61
7 changed files with 33 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -112,11 +112,13 @@ class Location(LocationSlug, EditorFormMixin, models.Model):
return self._meta.verbose_name + ' ' + self.slug
return super().title
def get_color(self):
def get_color(self, instance=None):
if self.color:
return self.color
# dont filter in the query here so prefetch_related works
groups = [group for group in self.groups.all() if group.color is not None]
if instance is None:
instance = self
groups = [group for group in instance.groups.all() if group.color is not None]
if not groups:
return None
for group in groups: