forked from expo/troggle
fixed duplicate paths to same page
This commit is contained in:
8
urls.py
8
urls.py
@@ -7,7 +7,7 @@ from django.conf.urls.static import static
|
||||
from troggle.core.views import statistics, survex
|
||||
from troggle.core.views.auth import expologin, expologout
|
||||
from troggle.core.views.caves import (cave3d, caveindex, entranceindex,
|
||||
cavepage, caveQMs, edit_cave, cave_debug,
|
||||
cavepage, caveslugfwd, cavepagefwd, caveQMs, edit_cave, cave_debug,
|
||||
edit_entrance, get_entrances, qm, expo_kml, expo_kmz)
|
||||
from troggle.core.views.drawings import dwgallfiles, dwgfilesingle
|
||||
from troggle.core.views.editor_helpers import image_selector, new_image_form
|
||||
@@ -142,7 +142,7 @@ trogglepatterns = [
|
||||
re_path(r'^getEntrances/(?P<caveslug>.*)', get_entrances, name = "get_entrances"), # used internally ?
|
||||
|
||||
# Cave description pages
|
||||
path('cave/<slug:slug>', cavepage, name="cavepage"),
|
||||
path('cave/<slug:slug>', caveslugfwd, name="caveslugfwd"),
|
||||
path('cave_debug', cave_debug, name="cave_debug"),
|
||||
re_path(r'^newcave/$', edit_cave, name="newcave"),
|
||||
re_path(r'^cave/3d/(?P<cave_id>[^/]+).3d$', cave3d, name="cave3d"),
|
||||
@@ -162,8 +162,8 @@ trogglepatterns = [
|
||||
# Note that _edit$ for a cave description page in a subfolder e.g. /1623/204/204.html_edit gets caught here and breaks with 404
|
||||
|
||||
# These re-enable archaic URLs which are in old web pages which are still public on other servers
|
||||
path('smkridge/<path:subpath>', cavepage, {'karea': "1623/"}, name="cavepage"),
|
||||
path('expo/smkridge/<path:subpath>', cavepage, {'karea': "1623/"}, name="cavepage"),
|
||||
path('smkridge/<path:subpath>', cavepagefwd, {'karea': "1623"}, name="cavepagefwd"),
|
||||
path('expo/smkridge/<path:subpath>', cavepagefwd, {'karea': "1623"}, name="cavepagefwd"),
|
||||
|
||||
# Archaic, kept. This /expo/ prefix only works for expoweb HTML pages not troggle pages
|
||||
path('expo/<path:path>', expopage, name="expopage"),
|
||||
|
||||
Reference in New Issue
Block a user