diff options
| author | Gary Wilson Jr <gary.wilson@gmail.com> | 2008-01-28 05:36:44 +0000 |
|---|---|---|
| committer | Gary Wilson Jr <gary.wilson@gmail.com> | 2008-01-28 05:36:44 +0000 |
| commit | a01ebb4a5095f69f8e4884598012e1667b13d0cf (patch) | |
| tree | 0a93e4be4cd6512e1605b9957e436963f19318f9 | |
| parent | 2e43934aedab56ae5885ba11a37248921e5a51f7 (diff) | |
Fixed #6354 -- Fixed url in `django/conf/urls/shortcut.py` to work with non-integer primary keys (refs #2033) and made use of the URL file in the admin urls.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7040 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/conf/urls/shortcut.py | 2 | ||||
| -rw-r--r-- | django/contrib/admin/urls.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/django/conf/urls/shortcut.py b/django/conf/urls/shortcut.py index f0ed9d9fd0..135f3be840 100644 --- a/django/conf/urls/shortcut.py +++ b/django/conf/urls/shortcut.py @@ -1,5 +1,5 @@ from django.conf.urls.defaults import * urlpatterns = patterns('django.views', - (r'^(?P<content_type_id>\d+)/(?P<object_id>\d+)/$', 'defaults.shortcut'), + (r'^(?P<content_type_id>\d+)/(?P<object_id>.*)/$', 'defaults.shortcut'), ) diff --git a/django/contrib/admin/urls.py b/django/contrib/admin/urls.py index 508bb3a1ca..436e9b7b23 100644 --- a/django/contrib/admin/urls.py +++ b/django/contrib/admin/urls.py @@ -8,7 +8,7 @@ else: urlpatterns = patterns('', ('^$', 'django.contrib.admin.views.main.index'), - ('^r/(\d+)/(.*)/$', 'django.views.defaults.shortcut'), + ('^r/', include('django.conf.urls.shortcut')), ('^jsi18n/$', i18n_view, {'packages': 'django.conf'}), ('^logout/$', 'django.contrib.auth.views.logout'), ('^password_change/$', 'django.contrib.auth.views.password_change'), |