diff options
| author | Simon Willison <simon@simonwillison.net> | 2008-06-15 18:53:30 +0000 |
|---|---|---|
| committer | Simon Willison <simon@simonwillison.net> | 2008-06-15 18:53:30 +0000 |
| commit | 10c7129eb09750ec4045c7d41bb3f3ae0dfb483a (patch) | |
| tree | 6ff76c302f75f7b9f1441d19611d58fbf3f801f8 | |
| parent | c6a26037e3722e794d94248e89bd397ed2cbbd75 (diff) | |
newforms-admin: Fixed root_path in custom user add view
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/admin/urls.py | 3 | ||||
| -rw-r--r-- | django/contrib/auth/admin.py | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/django/contrib/admin/urls.py b/django/contrib/admin/urls.py index e29140ae03..db0285ff89 100644 --- a/django/contrib/admin/urls.py +++ b/django/contrib/admin/urls.py @@ -1,5 +1,8 @@ from django.conf.urls.defaults import * +# This file is NO LONGER USED in newforms-admin. See AdminSite.root() and +# django.contrib.auth.admin instead. + urlpatterns = patterns('', #('^$', 'django.contrib.admin.views.main.index'), ('^r/', include('django.conf.urls.shortcut')), diff --git a/django/contrib/auth/admin.py b/django/contrib/auth/admin.py index 723893ccd1..963600688e 100644 --- a/django/contrib/auth/admin.py +++ b/django/contrib/auth/admin.py @@ -55,6 +55,7 @@ class UserAdmin(admin.ModelAdmin): 'opts': User._meta, 'save_as': False, 'username_help_text': User._meta.get_field('username').help_text, + 'root_path': self.admin_site.root_path, }, context_instance=template.RequestContext(request)) admin.site.register(Group, GroupAdmin) |