Added MEDIA_ROOT and MEDIA_URL.

mozilla · Sep 30, 2011 · 1803ad6 · 1803ad6
1 parent a55a189
commit 1803ad6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,6 @@
 collected-assets/*
 ccui/settings/local.py
 coverage/*
+media/*
 .livereload
 *.pyc
diff --git a/ccui/settings/base.py b/ccui/settings/base.py
@@ -46,6 +46,10 @@
 # Example: "http://media.lawrence.com/static/"
 STATIC_URL = "/static/"
 
+MEDIA_ROOT = join(BASE_PATH, "media")
+
+MEDIA_URL = "/media/"
+
 # A list of locations of additional static files
 STATICFILES_DIRS = [join(BASE_PATH, "static")]
 

diff --git a/ccui/urls.py b/ccui/urls.py
@@ -34,4 +34,8 @@
 if settings.DEBUG:
     urlpatterns += patterns(
         "",
-        url("^debug/", include("ccui.debug.urls")))
+        url("^debug/", include("ccui.debug.urls")),
+        url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+                'document_root': settings.MEDIA_ROOT,
+                }),
+        )
diff --git a/media/.keep b/media/.keep