Ticket #2600: SERVE_DEFAULT_ADMIN_MEDIA.diff

django/conf/project_template/settings.py

@@ -40 +40 @@
 # Examples: "http://foo.com/media/", "/media/".
 ADMIN_MEDIA_PREFIX = '/media/'
 
+# Whether the django development server should serve admin media from the
+# contrib/admin/media/ directory
+SERVE_DEFAULT_ADMIN_MEDIA = True
+
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = ''
 

django/conf/global_settings.py

@@ -142 +142 @@
 # Examples: "http://foo.com/media/", "/media/".
 ADMIN_MEDIA_PREFIX = '/media/'
 
+# Whether the django development server should serve admin media from the
+# contrib/admin/media/ directory
+SERVE_DEFAULT_ADMIN_MEDIA = True
+
 # Default e-mail address to use for various automated correspondence from
 # the site managers.
 DEFAULT_FROM_EMAIL = 'webmaster@localhost'

django/core/management.py

@@ -1053 +1053 @@
         print "Development server is running at http://%s:%s/" % (addr, port)
         print "Quit the server with %s." % quit_command
         try:
-            run(addr, int(port), AdminMediaHandler(WSGIHandler()))
+            handler = WSGIHandler()
+            if settings.SERVE_DEFAULT_ADMIN_MEDIA:
+                handler = AdminMediaHandler(handler)
+            run(addr, int(port), handler)
         except WSGIServerException, e:
             # Use helpful error messages instead of ugly tracebacks.
             ERRORS = {