Ticket #10223: 10223-charfield_pk_with_slashes_view_on_site.diff

django/contrib/admin/sites.py

@@ -474 +474 @@
         # URLs starting with 'r/' are for the "View on site" links.
         elif url.startswith('r/'):
             from django.contrib.contenttypes.views import shortcut
-            return shortcut(request, *url.split('/')[1:])
+            return shortcut(request, *url.split('/', 2)[1:])
         else:
             if '/' in url:
                 return self.model_page(request, *url.split('/', 2))

tests/regressiontests/admin_views/models.py

@@ -122 +122 @@
 
     def __unicode__(self):
         return self.id
+
+    def get_absolute_url(self):
+        return "/" + self.id
 
 class Color(models.Model):
     value = models.CharField(max_length=10)

tests/regressiontests/admin_views/tests.py

@@ -22 +22 @@
     set
 except NameError:
     from sets import Set as set
+
+class LegacyAdminViewBasicTest(TestCase):
+    """This test can be removed when we deprecate the root() AdminSite method in Django release 1.1 + 2."""
+
+    fixtures = ['admin-views-users.xml']
+    urlbit = 'legacy_admin'
+
+    def setUp(self):
+        self.client.login(username='super', password='secret')
+
+    def tearDown(self):
+        self.client.logout()
+
+    def testShortcutWithSlash(self):
+        """Ensures the 'view on Site' links work for models with string PKs values that contain slashes."""
+        obj = ModelWithStringPrimaryKey(id="pk/with/slashes")
+        obj.save()
+        content_type_pk = ContentType.objects.get_for_model(ModelWithStringPrimaryKey).pk
+        short_url = '/test_admin/%s/r/%s/%s/' % (self.urlbit, content_type_pk, obj.pk)
+        response = self.client.get(short_url)
+        self.assertRedirects(response, 'http://example.com%s' % obj.get_absolute_url(),
+                             status_code=302, target_status_code=404)
+
 
 class AdminViewBasicTest(TestCase):
     fixtures = ['admin-views-users.xml', 'admin-views-colors.xml', 'admin-views-fabrics.xml']

tests/regressiontests/admin_views/urls.py

@@ -2 +2 @@
 from django.contrib import admin
 import views
 import customadmin
+import legacyadmin
 
 urlpatterns = patterns('',
     (r'^admin/doc/', include('django.contrib.admindocs.urls')),
     (r'^admin/secure-view/$', views.secure_view),
     (r'^admin/', include(admin.site.urls)),
     (r'^admin2/', include(customadmin.site.urls)),
+    (r'^legacy_admin/(.*)', legacyadmin.site.root),
 )