From 4d654c92ce5565b22fd18d5d0ffc2c9efe391497 Mon Sep 17 00:00:00 2001 From: Timo Graham Date: Sun, 16 Jan 2011 13:56:12 +0000 Subject: [PATCH] Fixed #15030 - ModelAdmin media docs don't mention STATIC_URL. Thanks jezdez for the suggestion, Silva for the draft patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15225 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/ref/contrib/admin/index.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt index ca7609cf80..34a2348723 100644 --- a/docs/ref/contrib/admin/index.txt +++ b/docs/ref/contrib/admin/index.txt @@ -1014,6 +1014,7 @@ provided some extra mapping data that would not otherwise be available:: def get_osm_info(self): # ... + pass def change_view(self, request, object_id, extra_context=None): my_context = { @@ -1036,8 +1037,12 @@ on your ``ModelAdmin``:: } js = ("my_code.js",) -Keep in mind that this will be prepended with :setting:`MEDIA_URL`. The same -rules apply as :doc:`regular media definitions on forms `. +.. versionchanged:: 1.3 + +The :doc:`staticfiles app ` prepends +:setting:`STATIC_URL` (or :setting:`MEDIA_URL` if :setting:`STATIC_URL` is +``None``) to any media paths. The same rules apply as :ref:`regular media +definitions on forms `. Django admin Javascript makes use of the `jQuery`_ library. To avoid conflict with user scripts, Django's jQuery is namespaced as