1
0
mirror of https://github.com/django/django.git synced 2025-10-23 21:59:11 +00:00

Fixed #21386 -- Removed admindocs dependence on sites framework

* Removed ADMIN_FOR setting and warn warning
* Group view functions by namespace instead of site
* Added a test verifying namespaces are listed

Thanks to Claude Paroz for reviewing and ideas for improvement.
This commit is contained in:
Bouke Haarsma
2013-11-05 10:16:27 +01:00
committed by Claude Paroz
parent f1b3ab9c21
commit a39d672ec7
8 changed files with 99 additions and 82 deletions

View File

@@ -1,11 +1,16 @@
from django.conf.urls import include, patterns
from django.conf.urls import include, patterns, url
from django.contrib import admin
from . import views
ns_patterns = patterns('',
url(r'^xview/func/$', views.xview_dec(views.xview), name='func'),
)
urlpatterns = patterns('',
(r'^admin/', include(admin.site.urls)),
(r'^admindocs/', include('django.contrib.admindocs.urls')),
(r'^', include(ns_patterns, namespace='test')),
(r'^xview/func/$', views.xview_dec(views.xview)),
(r'^xview/class/$', views.xview_dec(views.XViewClass.as_view())),
)