Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
  • Loading branch information...
commit 4d654c92ce5565b22fd18d5d0ffc2c9efe391497 1 parent ae8ff5f
Tim Graham authored January 16, 2011

Showing 1 changed file with 7 additions and 2 deletions. Show diff stats Hide diff stats

  1. 9  docs/ref/contrib/admin/index.txt
9  docs/ref/contrib/admin/index.txt
@@ -1014,6 +1014,7 @@ provided some extra mapping data that would not otherwise be available::
1014 1014
 
1015 1015
         def get_osm_info(self):
1016 1016
             # ...
  1017
+            pass
1017 1018
 
1018 1019
         def change_view(self, request, object_id, extra_context=None):
1019 1020
             my_context = {
@@ -1036,8 +1037,12 @@ on your ``ModelAdmin``::
1036 1037
             }
1037 1038
             js = ("my_code.js",)
1038 1039
 
1039  
-Keep in mind that this will be prepended with :setting:`MEDIA_URL`. The same
1040  
-rules apply as :doc:`regular media definitions on forms </topics/forms/media>`.
  1040
+.. versionchanged:: 1.3
  1041
+
  1042
+The :doc:`staticfiles app </ref/contrib/staticfiles>` prepends
  1043
+:setting:`STATIC_URL` (or :setting:`MEDIA_URL` if :setting:`STATIC_URL` is
  1044
+``None``) to any media paths. The same rules apply as :ref:`regular media
  1045
+definitions on forms <form-media-paths>`.
1041 1046
 
1042 1047
 Django admin Javascript makes use of the `jQuery`_ library. To avoid
1043 1048
 conflict with user scripts, Django's jQuery is namespaced as

0 notes on commit 4d654c9

Please sign in to comment.
Something went wrong with that request. Please try again.