diff -urN Django-0.95.1/django/contrib/admin/templatetags/admin_list.py Django-0.95.1-hb/django/contrib/admin/templatetags/admin_list.py
--- Django-0.95.1/django/contrib/admin/templatetags/admin_list.py 2006-07-21 19:11:13.000000000 +0200
+++ Django-0.95.1-hb/django/contrib/admin/templatetags/admin_list.py 2007-02-02 13:49:26.000000000 +0100
@@ -9,6 +9,7 @@
from django.utils.translation import get_date_formats, get_partial_date_formats
from django.template import Library
import datetime
+from urlparse import urljoin
register = Library()
@@ -148,7 +149,7 @@
# Booleans are special: We use images.
elif isinstance(f, models.BooleanField) or isinstance(f, models.NullBooleanField):
BOOLEAN_MAPPING = {True: 'yes', False: 'no', None: 'unknown'}
- result_repr = '' % (settings.ADMIN_MEDIA_PREFIX, BOOLEAN_MAPPING[field_val], field_val)
+ result_repr = '' % (urljoin(settings.MEDIA_URL, settings.ADMIN_MEDIA_PREFIX), BOOLEAN_MAPPING[field_val], field_val)
# FloatFields are special: Zero-pad the decimals.
elif isinstance(f, models.FloatField):
if field_val is not None:
diff -urN Django-0.95.1/django/contrib/admin/templatetags/admin_modify.py Django-0.95.1-hb/django/contrib/admin/templatetags/admin_modify.py
--- Django-0.95.1/django/contrib/admin/templatetags/admin_modify.py 2006-07-21 19:11:13.000000000 +0200
+++ Django-0.95.1-hb/django/contrib/admin/templatetags/admin_modify.py 2007-02-02 13:53:05.000000000 +0100
@@ -7,6 +7,7 @@
from django.db.models.related import BoundRelatedObject
from django.conf import settings
import re
+from urlparse import urljoin
register = template.Library()
@@ -29,7 +30,7 @@
' % (settings.ADMIN_MEDIA_PREFIX, script_path)
+ return '' % (urljoin(settings.MEDIA_URL, settings.ADMIN_MEDIA_PREFIX), script_path)
include_admin_script = register.simple_tag(include_admin_script)
def submit_row(context):
@@ -196,7 +197,7 @@
if f.rel and isinstance(f.rel, models.ManyToManyRel) and f.rel.filter_interface:
return '\n' % (
- f.name, f.verbose_name, f.rel.filter_interface-1, settings.ADMIN_MEDIA_PREFIX)
+ f.name, f.verbose_name, f.rel.filter_interface-1, urljoin(settings.MEDIA_URL, settings.ADMIN_MEDIA_PREFIX))
else:
return ''
filter_interface_script_maybe = register.simple_tag(filter_interface_script_maybe)
diff -urN Django-0.95.1/django/contrib/admin/templatetags/adminmedia.py Django-0.95.1-hb/django/contrib/admin/templatetags/adminmedia.py
--- Django-0.95.1/django/contrib/admin/templatetags/adminmedia.py 2006-05-16 22:28:50.000000000 +0200
+++ Django-0.95.1-hb/django/contrib/admin/templatetags/adminmedia.py 2007-02-02 13:51:55.000000000 +0100
@@ -1,14 +1,15 @@
from django.template import Library
+from urlparse import urljoin
register = Library()
def admin_media_prefix():
"""
- Returns the string contained in the setting ADMIN_MEDIA_PREFIX.
+ Returns the string contained in the settings MEDIA_URL and ADMIN_MEDIA_PREFIX.
"""
try:
from django.conf import settings
except ImportError:
return ''
- return settings.ADMIN_MEDIA_PREFIX
+ return urljoin(settings.MEDIA_URL, settings.ADMIN_MEDIA_PREFIX)
admin_media_prefix = register.simple_tag(admin_media_prefix)