Index: django/contrib/admin/templatetags/admin_modify.py
===================================================================
--- django/contrib/admin/templatetags/admin_modify.py (revision 4233)
+++ django/contrib/admin/templatetags/admin_modify.py (working copy)
@@ -18,18 +18,19 @@
def include_admin_script(script_path):
"""
Returns an HTML script element for including a script from the admin
- media url.
+ media url (or other location if an absolute url is given).
Example usage::
- {% include_admin_script js/calendar.js %}
+ {% include_admin_script "js/calendar.js" %}
could return::
' % (settings.ADMIN_MEDIA_PREFIX, script_path)
+ if not script_path.startswith('/') and '://' not in script_path:
+ script_path = '%s%s' % (settings.ADMIN_MEDIA_PREFIX, script_path)
+ return '' % script_path
include_admin_script = register.simple_tag(include_admin_script)
def submit_row(context):
Index: docs/model-api.txt
===================================================================
--- docs/model-api.txt (revision 4233)
+++ docs/model-api.txt (working copy)
@@ -1206,6 +1206,9 @@
admin page in JavaScript or to provide "quick links" to fill in default values
for certain fields.
+If relative URLs are used, Django admin will automatically prepend these links
+with ``settings.ADMIN_MEDIA_PREFIX``.
+
``list_display``
----------------