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

rename and refactor mapdata models

Browse source
This commit is contained in:
Laura Klünder 2017-05-05 12:32:35 +02:00
parent a18dc108c1
commit 5973ca3211
10 changed files with 86 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/c3nav/editor/forms.py
View file

@ -100,6 +100,6 @@ def create_editor_form(mapitemtype):
def create_editor_forms():
from c3nav.mapdata.models.base import MAPITEM_TYPES
for mapitemtype in MAPITEM_TYPES.values():
from c3nav.mapdata.models.base import FEATURE_TYPES
for mapitemtype in FEATURE_TYPES.values():
create_editor_form(mapitemtype)

8
src/c3nav/editor/views.py
View file

@ -5,7 +5,7 @@ from django.shortcuts import get_object_or_404, redirect, render
from c3nav.access.apply import can_access, filter_queryset_by_access
from c3nav.mapdata.models import AreaLocation
from c3nav.mapdata.models.base import MAPITEM_TYPES
from c3nav.mapdata.models.base import FEATURE_TYPES
def list_mapitemtypes(request, level):
@ -26,13 +26,13 @@ def list_mapitemtypes(request, level):
'title': mapitemtype._meta.verbose_name_plural,
'has_level': hasattr(mapitemtype, 'level') or hasattr(mapitemtype, 'levels'),
'count': get_item_count(mapitemtype),
} for name, mapitemtype in MAPITEM_TYPES.items()
} for name, mapitemtype in FEATURE_TYPES.items()
],
})
def list_mapitems(request, mapitem_type, level=None):
mapitemtype = MAPITEM_TYPES.get(mapitem_type)
mapitemtype = FEATURE_TYPES.get(mapitem_type)
if mapitemtype is None:
raise Http404('Unknown mapitemtype.')
@ -68,7 +68,7 @@ def list_mapitems(request, mapitem_type, level=None):
def edit_mapitem(request, mapitem_type, name=None):
mapitemtype = MAPITEM_TYPES.get(mapitem_type)
mapitemtype = FEATURE_TYPES.get(mapitem_type)
if mapitemtype is None:
raise Http404()