Changeset 8913d43

Timestamp:

May 12, 2010, 11:05:42 PM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, fysm-4-1, iframe, space-access, stable, stage, test-hooks

Children:

80982de

Parents:

ca9348d

git-author:

Alex Dehnert <adehnert@…> (05/12/10 23:05:42)

git-committer:

Alex Dehnert <adehnert@…> (05/12/10 23:05:42)

Message:

Serve up media

Location:

asadb

Files:

• settings.py (modified) (2 diffs)
• urls.py (modified) (2 diffs)

asadb/settings.py

@@ -1 +1 @@
 # Django settings for asadb project.
+import os
+import sys
+
+SITE_ROOT = os.path.normpath(os.path.dirname(__file__))
+SITE_WEB_PATH = ''
+
 
 DEBUG = True
@@ -38 +44 @@
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = ''
+MEDIA_ROOT = SITE_ROOT + '/media/'
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
 # Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = ''
+MEDIA_URL = SITE_WEB_PATH + '/media/'
 
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.
 # Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/'
+ADMIN_MEDIA_PREFIX = SITE_WEB_PATH + '/media/admin/'
 
 # Make this unique, and don't share it with anybody.

asadb/urls.py

@@ -4 +4 @@
 from django.contrib import admin
 admin.autodiscover()
+
+import settings
 
 urlpatterns = patterns('',
@@ -16 +18 @@
     (r'^admin/', include(admin.site.urls)),
 )
+
+if settings.DEBUG:
+    from django.views.static import serve
+    _media_url = settings.MEDIA_URL
+    if _media_url.startswith('/'):
+        _media_url = _media_url[1:]
+        urlpatterns += patterns('',
+                                (r'^%s(?P<path>.*)$' % _media_url,
+                                serve,
+                                {'document_root': settings.MEDIA_ROOT}))
+    del(_media_url, serve)