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

fix subtitles if space_cache or level_cache are empty

Browse source
This commit is contained in:
Laura Klünder 2017-10-31 14:08:01 +01:00
parent b3e577349b
commit 247d6b119e
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/c3nav/mapdata/models/geometry/level.py
View file

@ -46,10 +46,11 @@ class LevelGeometryMixin(GeometryMixin):
@property @property
def subtitle(self): def subtitle(self):
base_subtitle = super().subtitle base_subtitle = super().subtitle
if self.level_cache is not None: level = getattr(self, 'level_cache', None)
if level is not None:
return format_lazy(_('{category}, {level}'), return format_lazy(_('{category}, {level}'),
category=base_subtitle, category=base_subtitle,
level=self.level_cache.title) level=level.title)
return base_subtitle return base_subtitle
def register_change(self, force=False): def register_change(self, force=False):

12
src/c3nav/mapdata/models/geometry/space.py
View file

@ -32,15 +32,17 @@ class SpaceGeometryMixin(GeometryMixin):
@property @property
def subtitle(self): def subtitle(self):
base_subtitle = super().subtitle base_subtitle = super().subtitle
if self.space_cache is not None: space = getattr(self, 'space_cache', None)
if self.space_cache.level_cache is not None: if space is not None:
level = getattr(space, 'level_cache', None)
if level is not None:
return format_lazy(_('{category}, {space}, {level}'), return format_lazy(_('{category}, {space}, {level}'),
category=base_subtitle, category=base_subtitle,
space=self.space_cache.title, space=space.title,
level=self.space_cache.level_cache.title) level=level.title)
return format_lazy(_('{category}, {space}'), return format_lazy(_('{category}, {space}'),
category=base_subtitle, category=base_subtitle,
level=self.space_cache.title) level=space.title)
return base_subtitle return base_subtitle
def register_change(self, force=True): def register_change(self, force=True):