From 159e569de64afac450ebd9ad48390c71e0be79ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Sun, 21 May 2017 14:15:12 +0200 Subject: [PATCH] add Buildings and Holes to editor --- src/c3nav/editor/urls.py | 2 ++ src/c3nav/editor/views.py | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/c3nav/editor/urls.py b/src/c3nav/editor/urls.py index b95d726e..0f62f2be 100644 --- a/src/c3nav/editor/urls.py +++ b/src/c3nav/editor/urls.py @@ -26,8 +26,10 @@ urlpatterns = [ ] urlpatterns.extend(add_editor_urls('sections', 'Section', with_list=False, explicit_edit=True)) urlpatterns.extend(add_editor_urls('locationgroups', 'LocationGroup')) +urlpatterns.extend(add_editor_urls('buildings', 'Building')) urlpatterns.extend(add_editor_urls('spaces', 'Space', 'sections', 'section', explicit_edit=True)) urlpatterns.extend(add_editor_urls('doors', 'Door', 'sections', 'section')) +urlpatterns.extend(add_editor_urls('holes', 'Hole')) urlpatterns.extend(add_editor_urls('areas', 'Area', 'spaces', 'space')) urlpatterns.extend(add_editor_urls('stairs', 'Stair', 'spaces', 'space')) urlpatterns.extend(add_editor_urls('obstacles', 'Obstacle', 'spaces', 'space')) diff --git a/src/c3nav/editor/views.py b/src/c3nav/editor/views.py index b95d1b63..63af5f52 100644 --- a/src/c3nav/editor/views.py +++ b/src/c3nav/editor/views.py @@ -8,7 +8,8 @@ from django.urls import reverse from django.utils.translation import ugettext_lazy as _ from django.views.decorators.cache import never_cache -from c3nav.mapdata.models import Area, Door, LineObstacle, LocationGroup, Obstacle, Section, Space, Stair +from c3nav.mapdata.models import (Area, Building, Door, Hole, LineObstacle, LocationGroup, Obstacle, Section, Space, + Stair) from c3nav.mapdata.models.base import EDITOR_FORM_MODELS from c3nav.mapdata.models.geometry.space import Point @@ -47,6 +48,10 @@ def section_detail(request, pk): 'section_as_pk': True, 'child_models': [{ + 'title': Building._meta.verbose_name_plural, + 'url': reverse('editor.buildings.list', kwargs={'section': pk}), + 'count': section.buildings.count(), + }, { 'title': Space._meta.verbose_name_plural, 'url': reverse('editor.spaces.list', kwargs={'section': pk}), 'count': section.spaces.count(), @@ -54,6 +59,10 @@ def section_detail(request, pk): 'title': Door._meta.verbose_name_plural, 'url': reverse('editor.doors.list', kwargs={'section': pk}), 'count': section.doors.count(), + }, { + 'title': Hole._meta.verbose_name_plural, + 'url': reverse('editor.holes.list', kwargs={'section': pk}), + 'count': section.holes.count(), }], })