projects
/
matthijs
/
projects
/
xerxes.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2b48659
)
Switch the urlconf to use the new django admin interface.
author
Matthijs Kooijman
<matthijs@stdin.nl>
Mon, 28 Jul 2008 16:13:45 +0000
(18:13 +0200)
committer
Matthijs Kooijman
<matthijs@stdin.nl>
Mon, 28 Jul 2008 16:13:45 +0000
(18:13 +0200)
urls.py
patch
|
blob
|
history
diff --git
a/urls.py
b/urls.py
index 5b2c6f75a77eb6936d7973b443b8051319c571d4..1b4e4004d9086e3732085dbcd3bc60c54ae103ef 100644
(file)
--- a/
urls.py
+++ b/
urls.py
@@
-1,12
+1,16
@@
from django.conf import settings
from django.conf.urls.defaults import *
from django.conf import settings
from django.conf.urls.defaults import *
+from django.contrib import admin
from xerxes.influences.models import Character
from xerxes.influences.models import Influence
import os
from xerxes.influences.models import Character
from xerxes.influences.models import Influence
import os
-
+
+# Automatically import admin.py from all INSTALLED_APPS
+admin.autodiscover()
+
urlpatterns = patterns('',
url(r'^$', 'django.views.generic.simple.redirect_to', {'url' : '/influences/'}),
urlpatterns = patterns('',
url(r'^$', 'django.views.generic.simple.redirect_to', {'url' : '/influences/'}),
-
url(r'^admin/', include('django.contrib.admin.urls')
),
+
(r'^admin/(.*)', admin.site.root
),
url(r'^comments/', include('threadedcomments.urls')),
url(r'^influences/$', 'xerxes.influences.views.index', name='influences_index'),
url(r'^comments/', include('threadedcomments.urls')),
url(r'^influences/$', 'xerxes.influences.views.index', name='influences_index'),