From d51bc684bb76ff15c511f6b09397401382aa9280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Sat, 23 Dec 2017 02:27:10 +0100 Subject: [PATCH] fix level_change_description check --- src/c3nav/mapdata/models/graph.py | 2 +- src/c3nav/routing/route.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/c3nav/mapdata/models/graph.py b/src/c3nav/mapdata/models/graph.py index 80714d42..0f147663 100644 --- a/src/c3nav/mapdata/models/graph.py +++ b/src/c3nav/mapdata/models/graph.py @@ -45,7 +45,7 @@ class WayType(SerializableMixin, models.Model): speed_up = models.DecimalField(_('speed upwards (m/s)'), max_digits=3, decimal_places=1, default=1, validators=[MinValueValidator(Decimal('0.1'))]) description_up = I18nField(_('description upwards'), fallback_any=True) - level_change_description = I18nField(_('level change description'), default='') + level_change_description = I18nField(_('level change description')) class Meta: verbose_name = _('Way Type') diff --git a/src/c3nav/routing/route.py b/src/c3nav/routing/route.py index d31bd621..c99d5ee6 100644 --- a/src/c3nav/routing/route.py +++ b/src/c3nav/routing/route.py @@ -83,7 +83,8 @@ class Route: description = item.waytype.description if item.waytype.up_separate and item.edge.rise > 0: description = item.waytype.description_up - if item.waytype.level_change_description and item.last_item and item.level != item.last_item.level: + if (item.waytype.level_change_description != False and + item.last_item and item.level != item.last_item.level): # != False because it's lazy description = (description % { 'level_change_description': ' '+(item.waytype.level_change_description % {'level': item.level.title})+ ' '