fix media handling

v1-0-stable
Christian Merten 9 years ago
parent 69b053c8d1
commit 8726794163

@ -31,8 +31,10 @@ DEBUG = os.environ.get('DJANGO_DEBUG', '1') == '1'
ALLOWED_HOSTS = os.environ.get('DJANGO_ALLOWED_HOST', '').split(",") ALLOWED_HOSTS = os.environ.get('DJANGO_ALLOWED_HOST', '').split(",")
# Define media paths e.g. for image storage # Define media paths e.g. for image storage
MEDIA_ROOT = os.path.join((os.path.join(BASE_DIR, os.pardir)), "media")
MEDIA_URL = '/media/' MEDIA_URL = '/media/'
MEDIA_ROOT = os.environ.get('DJANGO_MEDIA_ROOT',
os.path.join((os.path.join(BASE_DIR, os.pardir)), "media"))
MEDIA_MEMBERLISTS = os.path.join((os.path.join(BASE_DIR, os.pardir)), "media")
# x forward # x forward

@ -360,8 +360,8 @@ admin.site.register(ActivityCategory, ActivityCategoryAdmin)
def media_path(fp): def media_path(fp):
return os.path.join(os.path.join(settings.MEDIA_ROOT, "memberlists"), fp) return os.path.join(os.path.join(settings.MEDIA_MEMBERLISTS, "memberlists"), fp)
def media_dir(): def media_dir():
return os.path.join(settings.MEDIA_ROOT, "memberlists") return os.path.join(settings.MEDIA_MEMBERLISTS, "memberlists")

Loading…
Cancel
Save