Django

Code

Show
Ignore:
Timestamp:
07/18/08 18:54:34 (6 months ago)
Author:
brosner
Message:

Merged the newforms-admin branch into trunk.

This is a backward incompatible change. The admin contrib app has been
refactored. The newforms module has several improvements including FormSets?
and Media definitions.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r6671 r7967  
    22from django.contrib.contenttypes.models import ContentType 
    33from django.contrib.auth.models import User 
     4from django.contrib.admin.util import quote 
    45from django.utils.translation import ugettext_lazy as _ 
    56from django.utils.encoding import smart_unicode 
    …… 
    5152        This is relative to the Django admin index page. 
    5253        """ 
    53         return mark_safe(u"%s/%s/%s/" % (self.content_type.app_label, self.content_type.model, self.object_id)) 
     54        return mark_safe(u"%s/%s/%s/" % (self.content_type.app_label, self.content_type.model, quote(self.object_id)))