Changeset 7935 for django/branches/newforms-admin/django/contrib/admin/views

Timestamp:

07/16/08 14:21:15 (6 months ago)

Author:

brosner

Message:

newforms-admin: Fixed #5490 -- Properly quote special characters in primary keys in the admin. Added tests to ensure functionality. This also moves quote and unquote to django/contrib/admin/util.py. Thanks jdetaeye and shanx for all your help.

Files:

• django/branches/newforms-admin/django/contrib/admin/views/main.py (modified) (2 diffs)

django/branches/newforms-admin/django/contrib/admin/views/main.py

@@ -1 +1 @@
-from django.contrib.admin.filterspecs import FilterSpec
-from django.contrib.admin.options import IncorrectLookupParameters
+from django.contrib.admin.util import quote
-from django.core.paginator import Paginator, InvalidPage
-from django.db import models
@@ -30 +31 @@
-# Text to display within change-list table cells if the value is blank.
-EMPTY_CHANGELIST_VALUE = '(None)'
-
-def quote(s):
-    """
-    Ensure that primary key values do not confuse the admin URLs by escaping
-    any '/', '_' and ':' characters. Similar to urllib.quote, except that the
-    quoting is slightly different so that it doesn't get automatically
-    unquoted by the Web browser.
-    """
-    if type(s) != type(''):
-        return s
-    res = list(s)
-    for i in range(len(res)):
-        c = res[i]
-        if c in ':/_':
-            res[i] = '_%02X' % ord(c)
-    return ''.join(res)
-
-class ChangeList(object):