diff options
| author | Christopher Long <indirecthit@gmail.com> | 2006-08-14 18:52:53 +0000 |
|---|---|---|
| committer | Christopher Long <indirecthit@gmail.com> | 2006-08-14 18:52:53 +0000 |
| commit | dc3c4db1141b1c38c2a7a40b14924f6a0a1ac565 (patch) | |
| tree | 977d9c3d317782f2e9b243a41f2bc38d85b21db9 | |
| parent | 4cfd3203a67cd6e1fccccab5c85da5551814d2ee (diff) | |
| download | django-dc3c4db1141b1c38c2a7a40b14924f6a0a1ac565.tar.gz | |
[per-object-permissions] Merged to revision 3582 (resolved conflict)
git-svn-id: http://code.djangoproject.com/svn/django/branches/per-object-permissions@3584 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/admin/urls.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/django/contrib/admin/urls.py b/django/contrib/admin/urls.py index c051bfe9be..f36ea48eef 100644 --- a/django/contrib/admin/urls.py +++ b/django/contrib/admin/urls.py @@ -21,7 +21,6 @@ urlpatterns = patterns('', ('^doc/tags/$', 'django.contrib.admin.views.doc.template_tag_index'), ('^doc/filters/$', 'django.contrib.admin.views.doc.template_filter_index'), ('^doc/views/$', 'django.contrib.admin.views.doc.view_index'), - ('^doc/views/jump/$', 'django.contrib.admin.views.doc.jump_to_view'), ('^doc/views/(?P<view>[^/]+)/$', 'django.contrib.admin.views.doc.view_detail'), ('^doc/models/$', 'django.contrib.admin.views.doc.model_index'), ('^doc/models/(?P<app_label>[^\.]+)\.(?P<model_name>[^/]+)/$', 'django.contrib.admin.views.doc.model_detail'), @@ -33,6 +32,9 @@ urlpatterns = patterns('', ('^auth/row_level_permission/(?P<ct_id>\d+)/(?P<rlp_id>\d+)/(?P<hash>\w+)/change/$', 'django.contrib.admin.views.row_level_permissions.change_row_level_permission'), ('^auth/row_level_permission/add/(?P<ct_id>\d+)/(?P<obj_id>\d+)/$', 'django.contrib.admin.views.row_level_permissions.add_row_level_permission'), + # "Add user" -- a special-case view + ('^auth/user/add/$', 'django.contrib.admin.views.auth.user_add_stage'), + # Add/change/delete/history ('^([^/]+)/([^/]+)/$', 'django.contrib.admin.views.main.change_list'), ('^([^/]+)/([^/]+)/add/$', 'django.contrib.admin.views.main.add_stage'), |