Django

Code

Show
Ignore:
Timestamp:
02/08/08 14:57:56 (1 year ago)
Author:
jbronn
Message:

gis: Merged revisions 7044-7102 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7043 to /django/trunk:1-7102

  • django/branches/gis/django/contrib/databrowse/datastructures.py

    r6990 r7103  
    106106 
    107107    def url(self): 
    108         return '%s%s/%s/objects/%s/' % (self.model.site.root_url, self.model.model._meta.app_label, self.model.model._meta.module_name, iri_to_uri(self.pk())) 
     108        return mark_safe('%s%s/%s/objects/%s/' % (self.model.site.root_url, self.model.model._meta.app_label, self.model.model._meta.module_name, iri_to_uri(self.pk()))) 
    109109 
    110110    def fields(self):