Ticket #3015: admin-urls-permalink-compatible.patch

django/contrib/admin/urls.py

@@ -8 +8 @@
 
 urlpatterns = patterns('',
     ('^$', 'django.contrib.admin.views.main.index'),
-    ('^r/(\d+)/(.*)/$', 'django.views.defaults.shortcut'),
+    ('^r/(?P<content_type_id>\d+)/(?P<object_id>.*)/$', 'django.views.defaults.shortcut'),
     ('^jsi18n/$', i18n_view, {'packages': 'django.conf'}),
     ('^logout/$', 'django.contrib.auth.views.logout'),
     ('^password_change/$', 'django.contrib.auth.views.password_change'),
@@ -31 +31 @@
     ('^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'),
-    ('^([^/]+)/([^/]+)/(.+)/history/$', 'django.contrib.admin.views.main.history'),
-    ('^([^/]+)/([^/]+)/(.+)/delete/$', 'django.contrib.admin.views.main.delete_stage'),
-    ('^([^/]+)/([^/]+)/(.+)/$', 'django.contrib.admin.views.main.change_stage'),
+    ('^(?P<app_label>[^/]+)/(?P<model_name>[^/]+)/$', 'django.contrib.admin.views.main.change_list'),
+    ('^(?P<app_label>[^/]+)/(?P<model_name>[^/]+)/add/$', 'django.contrib.admin.views.main.add_stage'),
+    ('^(?P<app_label>[^/]+)/(?P<model_name>[^/]+)/(?P<object_id>.+)/history/$', 'django.contrib.admin.views.main.history'),
+    ('^(?P<app_label>[^/]+)/(?P<model_name>[^/]+)/(?P<object_id>.+)/delete/$', 'django.contrib.admin.views.main.delete_stage'),
+    ('^(?P<app_label>[^/]+)/(?P<model_name>[^/]+)/(?P<object_id>.+)/$', 'django.contrib.admin.views.main.change_stage'),
 )
 
 del i18n_view