Permalink
Browse files

Fixed #2869 -- Do not append ADMIN_MEDIA_PREFIX to absolute-path URLs…

… used for

included javascript. Based on patches from SmileyChris and oyvind@saltvik.no.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4692 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent cc8d656 commit ab64b383177f8e554c876d7c8574df6169ecc515 @malcolmt malcolmt committed Mar 9, 2007
Showing with 9 additions and 4 deletions.
  1. +6 −4 django/contrib/admin/templatetags/admin_modify.py
  2. +3 −0 docs/model-api.txt
View
10 django/contrib/admin/templatetags/admin_modify.py
@@ -11,25 +11,27 @@
register = template.Library()
word_re = re.compile('[A-Z][a-z]+')
+absolute_url_re = re.compile(r'^(?:http(?:s)?:/)?/', re.IGNORECASE)
def class_name_to_underscored(name):
return '_'.join([s.lower() for s in word_re.findall(name)[:-1]])
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::
<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)
+ if not absolute_url_re.match(script_path):
+ script_path = '%s%s' % (settings.ADMIN_MEDIA_PREFIX, script_path)
+ return '<script type="text/javascript" src="%s"></script>' % script_path
include_admin_script = register.simple_tag(include_admin_script)
def submit_row(context):
View
3 docs/model-api.txt
@@ -1216,6 +1216,9 @@ screen via ``<script src="">`` tags. This can be used to tweak a given type of
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``
----------------

0 comments on commit ab64b38

Please sign in to comment.