custom room enter description

This commit is contained in:
Laura Klünder 2017-12-22 16:14:35 +01:00
parent 79314849dd
commit 3fb4d7f4b8
5 changed files with 27 additions and 3 deletions

View file

@ -142,7 +142,7 @@ def get_i18n_value(i18n_dict, fallback_language, fallback_any, fallback_value):
return i18n_dict[fallback_language]
if fallback_any:
return next(iter(i18n_dict.values()))
return str(fallback_value)
return None if fallback_value is None else str(fallback_value)
lazy_get_i18n_value = lazy(get_i18n_value, str)

View file

@ -0,0 +1,21 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.7 on 2017-12-22 15:13
from __future__ import unicode_literals
import c3nav.mapdata.fields
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('mapdata', '0066_area_slow_down_factor'),
]
operations = [
migrations.AddField(
model_name='space',
name='enter_description',
field=c3nav.mapdata.fields.I18nField(blank=True, fallback_language=None, verbose_name='Enter description'),
),
]

View file

@ -16,7 +16,7 @@ from shapely.geometry import JOIN_STYLE, LineString, MultiPolygon
from shapely.geometry.polygon import orient
from shapely.ops import unary_union
from c3nav.mapdata.fields import GeometryField
from c3nav.mapdata.fields import GeometryField, I18nField
from c3nav.mapdata.models import Level
from c3nav.mapdata.models.access import AccessRestrictionMixin
from c3nav.mapdata.models.geometry.base import GeometryMixin
@ -112,6 +112,7 @@ class Space(LevelGeometryMixin, SpecificLocation, models.Model):
height = models.DecimalField(_('height'), max_digits=6, decimal_places=2, null=True, blank=True,
validators=[MinValueValidator(Decimal('0'))])
outside = models.BooleanField(default=False, verbose_name=_('only outside of building'))
enter_description = I18nField(_('Enter description'), blank=True, fallback_language=None)
class Meta:
verbose_name = _('Space')