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

no longer needed to pass instance to some model methods

Browse source
This commit is contained in:
Laura Klünder 2024-08-22 14:17:19 +02:00
parent aab4230a3a
commit ca9cfc1e14
6 changed files with 24 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -75,10 +75,10 @@ class LocationSlug(SerializableMixin, models.Model):
objects = LocationSlugManager()
def get_child(self, instance=None):
def get_child(self):
for model in get_submodels(Location)+[LocationRedirect]:
with suppress(AttributeError):
return getattr(instance or self, model._meta.default_related_name)
return getattr(self, model._meta.default_related_name)
return None
def get_slug(self):
@ -159,16 +159,14 @@ class Location(LocationSlug, AccessRestrictionMixin, TitledMixin, models.Model):
def grid_square(self):
return None
def get_color(self, color_manager: 'ThemeColorManager', instance=None) -> str | None:
def get_color(self, color_manager: 'ThemeColorManager') -> str | None:
# don't filter in the query here so prefetch_related works
result = self.get_color_sorted(color_manager, instance)
result = self.get_color_sorted(color_manager)
return None if result is None else result[1]
def get_color_sorted(self, color_manager: 'ThemeColorManager', instance=None) -> tuple[tuple, str] | None:
def get_color_sorted(self, color_manager: 'ThemeColorManager') -> tuple[tuple, str] | None:
# don't filter in the query here so prefetch_related works
if instance is None:
instance = self
for group in instance.groups.all():
for group in self.groups.all():
color = color_manager.locationgroup_fill_color(group)
if color and getattr(group.category, 'allow_'+self.__class__._meta.default_related_name):
return (0, group.category.priority, group.hierarchy, group.priority), color