Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix admin rerouter, start new web docs

Browse source
This commit is contained in:
Griatch 2021-05-21 16:42:59 +02:00
parent 73f73f2473
commit 72e9fd6fd1
4 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/web/admin/urls.py
View file

@ -13,9 +13,9 @@ from . import frontpage
urlpatterns = [
# Django original admin page. Make this URL is always available, whether
# we've chosen to use Evennia's custom admin or not.
url(r"/django/", frontpage.admin_wrapper, name="django_admin"),
url(r"django/", frontpage.admin_wrapper, name="django_admin"),
# Admin docs
url(r"/doc/", include("django.contrib.admindocs.urls")),
url(r"doc/", include("django.contrib.admindocs.urls")),
]
if settings.EVENNIA_ADMIN:
@ -24,7 +24,7 @@ if settings.EVENNIA_ADMIN:
# Our override for the admin.
url("^$", frontpage.evennia_admin, name="evennia_admin"),
# Makes sure that other admin pages get loaded.
url(r"^/", admin.site.urls),
url(r"^", admin.site.urls),
]
else:
# Just include the normal Django admin.

2
evennia/web/urls.py
View file

@ -31,7 +31,7 @@ urlpatterns = [
# webclient
path("webclient/", include("evennia.web.webclient.urls")),
# admin
path("admin", include("evennia.web.admin.urls")),
path("admin/", include("evennia.web.admin.urls")),
# favicon
path("favicon.ico", RedirectView.as_view(url="/media/images/favicon.ico", permanent=False)),
]