Ticket #10223: 10223-charfield_pk_with_slashes_view_on_site-1.0.x.diff

django/contrib/admin/sites.py

@@ -152 +152 @@
         # 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

@@ -121 +121 @@
 
     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

@@ -227 +227 @@
             '<a href="?surface__exact=y">Vertical</a>' in response.content,
             "Changelist filter isn't showing options contained inside a model field 'choices' option named group."
         )
+
+    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)
+
 
 def get_perm(Model, perm):
     """Return the permission object, for the Model"""