Changeset 3584

Timestamp:

08/14/06 13:52:53 (2 years ago)

Author:

clong

Message:

[per-object-permissions] Merged to revision 3582 (resolved conflict)

Files:

• django/branches/per-object-permissions/django/contrib/admin/urls.py (modified) (2 diffs)

django/branches/per-object-permissions/django/contrib/admin/urls.py

@@ -22 +22 @@
-    ('^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'),
@@ -34 +33 @@
-    ('^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'),