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

it's _name_cache not name_cache

Browse source
This commit is contained in:
Laura Klünder 2017-11-27 15:39:42 +01:00
parent 5f2ca60432
commit dfe7d10574
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -65,7 +65,7 @@ class LevelGeometryMixin(GeometryMixin):
@property @property
def subtitle(self): def subtitle(self):
base_subtitle = super().subtitle base_subtitle = super().subtitle
level = getattr(self, 'level_cache', None) level = getattr(self, '_level_cache', None)
if level is not None: if level is not None:
return format_lazy(_('{category}, {level}'), return format_lazy(_('{category}, {level}'),
category=base_subtitle, category=base_subtitle,

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

@ -36,9 +36,9 @@ class SpaceGeometryMixin(GeometryMixin):
@property @property
def subtitle(self): def subtitle(self):
base_subtitle = super().subtitle base_subtitle = super().subtitle
space = getattr(self, 'space_cache', None) space = getattr(self, '_space_cache', None)
if space is not None: if space is not None:
level = getattr(space, 'level_cache', None) level = getattr(space, '_level_cache', None)
if level is not None: if level is not None:
return format_lazy(_('{category}, {space}, {level}'), return format_lazy(_('{category}, {space}, {level}'),
category=base_subtitle, category=base_subtitle,

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

@ -59,19 +59,19 @@ def locations_for_request(request) -> Mapping[int, LocationSlug]:
levels = {pk: obj for pk, obj in locations.items() if isinstance(obj, Level)} levels = {pk: obj for pk, obj in locations.items() if isinstance(obj, Level)}
for obj in locations.values(): for obj in locations.values():
if isinstance(obj, LevelGeometryMixin): if isinstance(obj, LevelGeometryMixin):
obj.level_cache = levels.get(obj.level_id, None) obj._level_cache = levels.get(obj.level_id, None)
# add spaces to areas and POIs # add spaces to areas and POIs
spaces = {pk: obj for pk, obj in locations.items() if isinstance(obj, Space)} spaces = {pk: obj for pk, obj in locations.items() if isinstance(obj, Space)}
for obj in locations.values(): for obj in locations.values():
if isinstance(obj, SpaceGeometryMixin): if isinstance(obj, SpaceGeometryMixin):
obj.space_cache = spaces.get(obj.space_id, None) obj._space_cache = spaces.get(obj.space_id, None)
# add targets to LocationRedirects # add targets to LocationRedirects
levels = {pk: obj for pk, obj in locations.items() if isinstance(obj, Level)} levels = {pk: obj for pk, obj in locations.items() if isinstance(obj, Level)}
for obj in locations.values(): for obj in locations.values():
if isinstance(obj, LocationRedirect): if isinstance(obj, LocationRedirect):
obj.target_cache = locations.get(obj.target_id, None) obj._target_cache = locations.get(obj.target_id, None)
# apply better space geometries # apply better space geometries
for pk, geometry in get_better_space_geometries().items(): for pk, geometry in get_better_space_geometries().items():