Django

Code

Changeset 7040

Show
Ignore:
Timestamp:
01/27/08 23:36:44 (1 year ago)
Author:
gwilson
Message:

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.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/conf/urls/shortcut.py

    r3 r7040  
    22 
    33urlpatterns = patterns('django.views', 
    4     (r'^(?P<content_type_id>\d+)/(?P<object_id>\d+)/$', 'defaults.shortcut'), 
     4    (r'^(?P<content_type_id>\d+)/(?P<object_id>.*)/$', 'defaults.shortcut'), 
    55) 

  • django/trunk/django/contrib/admin/urls.py

    r4266 r7040  
    99urlpatterns = patterns('', 
    1010    ('^$', 'django.contrib.admin.views.main.index'), 
    11     ('^r/(\d+)/(.*)/$', 'django.views.defaults.shortcut'), 
     11    ('^r/', include('django.conf.urls.shortcut')), 
    1212    ('^jsi18n/$', i18n_view, {'packages': 'django.conf'}), 
    1313    ('^logout/$', 'django.contrib.auth.views.logout'),