Author: clong
Date: 2006-08-14 13:52:53 -0500 (Mon, 14 Aug 2006)
New Revision: 3584
Modified:
django/branches/per-object-permissions/django/contrib/admin/urls.py
Log:
[per-object-permissions] Merged to revision 3582 (resolved conflict)
Modified: django/branches/per-object-permissions/django/contrib/admin/urls.py
===================================================================
--- django/branches/per-object-permissions/django/contrib/admin/urls.py
2006-08-14 18:52:03 UTC (rev 3583)
+++ django/branches/per-object-permissions/django/contrib/admin/urls.py
2006-08-14 18:52:53 UTC (rev 3584)
@@ -21,7 +21,6 @@
('^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 @@
('^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'),
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates
-~----------~----~----~----~------~----~------~--~---
