Commit a01ebb4a authored by Gary Wilson Jr's avatar Gary Wilson Jr
Browse files

Fixed #6354 -- Fixed url in `django/conf/urls/shortcut.py` to work with... 

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
parent 2e43934a

django/conf/urls/shortcut.py

+1 −1
Original line number Diff line number Diff line 
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'),

)

django/contrib/admin/urls.py

+1 −1
Original line number Diff line number Diff line
@@ -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'),