Ticket #3417: django-hb.diff

django/contrib/admin/templatetags/admin_list.py

@@ -9 +9 @@
 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 +149 @@
             # 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 = '<img src="%simg/admin/icon-%s.gif" alt="%s" />' % (settings.ADMIN_MEDIA_PREFIX, BOOLEAN_MAPPING[field_val], field_val)
+                result_repr = '<img src="%simg/admin/icon-%s.gif" alt="%s" />' % (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:

django/contrib/admin/templatetags/admin_modify.py

@@ -7 +7 @@
 from django.db.models.related import BoundRelatedObject
 from django.conf import settings
 import re
+from urlparse import urljoin
 
 register = template.Library()
 
@@ -29 +30 @@
         <script type="text/javascript" src="/media/admin/js/calendar.js">
     """
 
-    return '<script type="text/javascript" src="%s%s"></script>' % (settings.ADMIN_MEDIA_PREFIX, script_path)
+    return '<script type="text/javascript" src="%s%s"></script>' % (urljoin(settings.MEDIA_URL, settings.ADMIN_MEDIA_PREFIX), script_path)
 include_admin_script = register.simple_tag(include_admin_script)
 
 def submit_row(context):
@@ -196 +197 @@
     if f.rel and isinstance(f.rel, models.ManyToManyRel) and f.rel.filter_interface:
         return '<script type="text/javascript">addEvent(window, "load", function(e) {' \
               ' SelectFilter.init("id_%s", "%s", %s, "%s"); });</script>\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)

django/contrib/admin/templatetags/adminmedia.py

@@ -1 +1 @@
 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)