Anonymous avatar Anonymous committed cbcd78f

Switched MEDIA_DIR setting for Django's prescribed MEDIA_ROOT

Comments (0)

Files changed (2)

project/etc.templates/common.py

 
 ## Media
 
-MEDIA_DIR = PROJECT_DIR / 'media' / ''
+MEDIA_ROOT = PROJECT_DIR / 'media' / ''
 MEDIA_URL = '/media/'
 ADMIN_MEDIA_PREFIX = '/media/admin/'
-ADMIN_MEDIA_DIR = path(django.__file__).abspath().dirname() / 'contrib' / 'admin' / 'media'
+ADMIN_MEDIA_ROOT = path(django.__file__).abspath().dirname() / 'contrib' / 'admin' / 'media'
 
 ## Templates
 
 # web server anyway.
 urlpatterns += patterns('',
     url(r'^media/admin/(?P<path>.*)$', 'django.views.static.serve',
-        {'document_root': settings.ADMIN_MEDIA_DIR}),
+        {'document_root': settings.ADMIN_MEDIA_ROOT}),
     url(r'^media/(?P<path>.*)$', 'django.views.static.serve',
-        {'document_root': settings.MEDIA_DIR}),
+        {'document_root': settings.MEDIA_ROOT}),
 )
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.