From 587838161949cdd1e022fe8c12965a968c9bc0e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Tue, 14 Nov 2017 22:24:29 +0100 Subject: [PATCH] add door_height to editor form and serializer --- src/c3nav/editor/forms.py | 6 +++--- src/c3nav/mapdata/models/level.py | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/c3nav/editor/forms.py b/src/c3nav/editor/forms.py index cda5cf3f..716e0265 100644 --- a/src/c3nav/editor/forms.py +++ b/src/c3nav/editor/forms.py @@ -164,9 +164,9 @@ class EditorFormBase(ModelForm): def create_editor_form(editor_model): possible_fields = ['slug', 'name', 'ordering', 'category', 'width', 'groups', 'color', 'priority', 'base_altitude', - 'waytype', 'access_restriction', 'height', 'default_height', 'can_search', 'can_describe', - 'outside', 'geometry', 'single', 'allow_levels', 'allow_spaces', 'allow_areas', 'allow_pois', - 'altitude', 'short_label', 'left', 'top', 'right', 'bottom'] + 'waytype', 'access_restriction', 'height', 'default_height', 'door_height', 'outside', + 'can_search', 'can_describe', 'geometry', 'single', 'altitude', 'short_label', + 'allow_levels', 'allow_spaces', 'allow_areas', 'allow_pois', 'left', 'top', 'right', 'bottom'] field_names = [field.name for field in editor_model._meta.get_fields() if not field.one_to_many] existing_fields = [name for name in possible_fields if name in field_names] diff --git a/src/c3nav/mapdata/models/level.py b/src/c3nav/mapdata/models/level.py index 93e82b02..54df9602 100644 --- a/src/c3nav/mapdata/models/level.py +++ b/src/c3nav/mapdata/models/level.py @@ -80,6 +80,7 @@ class Level(SpecificLocation, models.Model): result['on_top_of'] = self.on_top_of_id result['base_altitude'] = float(str(self.base_altitude)) result['default_height'] = float(str(self.default_height)) + result['door_height'] = float(str(self.door_height)) return result def details_display(self):