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

remove editpk url converter

Browse source
This commit is contained in:
Laura Klünder 2024-08-26 17:10:05 +02:00
parent c36e2a163b
commit 76c90cd9f3
2 changed files with 15 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,8 +0,0 @@
class EditPkConverter:
regex = r'c?\d+'
def to_python(self, value):
return value
def to_url(self, value):
return value

32
src/c3nav/editor/urls.py
View file

@ -1,15 +1,12 @@
from django.apps import apps
from django.urls import path, register_converter
from django.urls import path
from c3nav.editor.converters import EditPkConverter
from c3nav.editor.views.account import change_password_view, login_view, logout_view, register_view
from c3nav.editor.views.changes import changeset_detail, changeset_edit, changeset_redirect
from c3nav.editor.views.edit import edit, graph_edit, level_detail, list_objects, main_index, sourceimage, space_detail
from c3nav.editor.views.overlays import overlays_list, overlay_features, overlay_feature_edit
from c3nav.editor.views.users import user_detail, user_redirect
register_converter(EditPkConverter, 'editpk')
def add_editor_urls(model_name, parent_model_name=None, with_list=True, explicit_edit=False):
model = apps.get_model('mapdata', model_name)
@ -17,7 +14,7 @@ def add_editor_urls(model_name, parent_model_name=None, with_list=True, explicit
if parent_model_name:
parent_model = apps.get_model('mapdata', parent_model_name)
parent_model_name_plural = parent_model._meta.default_related_name
prefix = (parent_model_name_plural+r'/<editpk:'+parent_model_name.lower()+'>/')+model_name_plural
prefix = (parent_model_name_plural+r'/<int:'+parent_model_name.lower()+'>/')+model_name_plural
else:
prefix = model_name_plural
@ -29,7 +26,7 @@ def add_editor_urls(model_name, parent_model_name=None, with_list=True, explicit
if with_list:
result.append(path(prefix+'/', list_objects, name=name_prefix+'list', kwargs=kwargs))
result.extend([
path(prefix+'/<editpk:pk>/'+explicit_edit, edit, name=name_prefix+'edit', kwargs=kwargs),
path(prefix+'/<int:pk>/'+explicit_edit, edit, name=name_prefix+'edit', kwargs=kwargs),
path(prefix+'/create', edit, name=name_prefix+'create', kwargs=kwargs),
])
return result
@ -37,19 +34,20 @@ def add_editor_urls(model_name, parent_model_name=None, with_list=True, explicit
# todo: custom path converters
urlpatterns = [
path('levels/<editpk:pk>/', level_detail, name='editor.levels.detail'),
path('levels/<editpk:level>/spaces/<editpk:pk>/', space_detail, name='editor.spaces.detail'),
path('levels/<editpk:on_top_of>/levels_on_top/create', edit, {'model': 'Level'},
path('levels/<int:pk>/', level_detail, name='editor.levels.detail'),
path('levels/<int:level>/spaces/<int:pk>/', space_detail, name='editor.spaces.detail'),
path('levels/<int:on_top_of>/levels_on_top/create', edit, {'model': 'Level'},
name='editor.levels_on_top.create'),
path('levels/<editpk:level>/graph/', graph_edit, name='editor.levels.graph'),
path('spaces/<editpk:space>/graph/', graph_edit, name='editor.spaces.graph'),
path('levels/<editpk:level>/overlays/', overlays_list, name='editor.levels.overlays'),
path('levels/<editpk:level>/overlays/<editpk:pk>/', overlay_features, name='editor.levels.overlay'),
path('levels/<editpk:level>/overlays/<editpk:overlay>/create', overlay_feature_edit, name='editor.levels.overlay.create'),
path('overlayfeatures/<editpk:pk>', overlay_feature_edit, name='editor.overlayfeatures.edit'),
path('levels/<int:level>/graph/', graph_edit, name='editor.levels.graph'),
path('spaces/<int:space>/graph/', graph_edit, name='editor.spaces.graph'),
path('levels/<int:level>/overlays/', overlays_list, name='editor.levels.overlays'),
path('levels/<int:level>/overlays/<int:pk>/', overlay_features, name='editor.levels.overlay'),
path('levels/<int:level>/overlays/<int:overlay>/create', overlay_feature_edit, name='editor.levels.overlay.create'),
path('levels/<int:level>/overlays/<int:overlay>/features/<int:pk>', overlay_feature_edit, name='editor.levels.overlay.edit'),
path('overlayfeatures/<int:pk>', overlay_feature_edit, name='editor.overlayfeatures.edit'),
path('changeset/', changeset_redirect, name='editor.changesets.current'),
path('changesets/<editpk:pk>/', changeset_detail, name='editor.changesets.detail'),
path('changesets/<editpk:pk>/edit', changeset_edit, name='editor.changesets.edit'),
path('changesets/<int:pk>/', changeset_detail, name='editor.changesets.detail'),
path('changesets/<int:pk>/edit', changeset_edit, name='editor.changesets.edit'),
path('sourceimage/<str:filename>', sourceimage, name='editor.sourceimage'),
path('user/', user_redirect, name='editor.users.redirect'),
path('users/<int:pk>/', user_detail, name='editor.users.detail'),