Ticket #914: absolute_include_admin_script-r4185.diff

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()
 
@@ -27 +28 @@
     could return::
 
         <script type="text/javascript" src="/media/admin/js/calendar.js">
+
+    or (if you use an absolute path)::
+
+        {% include_admin_script /myjs/other.js %}
+
+    could return::
+
+        <script type="text/javascript" src="/myjs/other.js">
     """
 
-    return '<script type="text/javascript" src="%s%s"></script>' % (settings.ADMIN_MEDIA_PREFIX, script_path)
+    return '<script type="text/javascript" src="%s"></script>' \
+           % urljoin(settings.ADMIN_MEDIA_PREFIX, script_path)
 include_admin_script = register.simple_tag(include_admin_script)
 
 def submit_row(context):