diff options
| author | Timo Graham <timograham@gmail.com> | 2011-01-16 13:56:12 +0000 |
|---|---|---|
| committer | Timo Graham <timograham@gmail.com> | 2011-01-16 13:56:12 +0000 |
| commit | 4d654c92ce5565b22fd18d5d0ffc2c9efe391497 (patch) | |
| tree | 552564eb87f72a5bfd3e5eca920cc139a57e8a07 /docs/ref | |
| parent | ae8ff5f476973d5623675460d36a2f3c6853f6d0 (diff) | |
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
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/contrib/admin/index.txt | 9 |
1 files 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 </topics/forms/media>`. +.. versionchanged:: 1.3 + +The :doc:`staticfiles app </ref/contrib/staticfiles>` 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 <form-media-paths>`. Django admin Javascript makes use of the `jQuery`_ library. To avoid conflict with user scripts, Django's jQuery is namespaced as |