From 49c4e4c54863c564205df78dfcb5a64597beff3d Mon Sep 17 00:00:00 2001 From: Christian Merten Date: Sat, 1 Feb 2025 17:53:58 +0100 Subject: [PATCH] settings: remove MEDIA_MEMBERLISTS and use MEDIA_ROOT everywhere --- jdav_web/jdav_web/settings/components/base.py | 1 - jdav_web/ludwigsburgalpin/admin.py | 2 +- jdav_web/members/pdf.py | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/jdav_web/jdav_web/settings/components/base.py b/jdav_web/jdav_web/settings/components/base.py index ca336b2..8bcefb3 100644 --- a/jdav_web/jdav_web/settings/components/base.py +++ b/jdav_web/jdav_web/settings/components/base.py @@ -20,7 +20,6 @@ BASE_URL = get_var('django', 'base_url', default=HOST) MEDIA_URL = '/media/' MEDIA_ROOT = get_var('django', 'media_root', default=os.path.join((os.path.join(BASE_DIR, os.pardir)), "media")) -MEDIA_MEMBERLISTS = os.path.join((os.path.join(BASE_DIR, os.pardir)), "media") # default primary key auto field type DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' diff --git a/jdav_web/ludwigsburgalpin/admin.py b/jdav_web/ludwigsburgalpin/admin.py index d7a2035..61b72da 100644 --- a/jdav_web/ludwigsburgalpin/admin.py +++ b/jdav_web/ludwigsburgalpin/admin.py @@ -77,4 +77,4 @@ admin.site.register(Termin, TerminAdmin) def media_path(fp): - return os.path.join(os.path.join(settings.MEDIA_MEMBERLISTS, "memberlists"), fp) + return os.path.join(os.path.join(settings.MEDIA_ROOT, "memberlists"), fp) diff --git a/jdav_web/members/pdf.py b/jdav_web/members/pdf.py index 05b2c2e..739226d 100644 --- a/jdav_web/members/pdf.py +++ b/jdav_web/members/pdf.py @@ -24,11 +24,11 @@ def find_template(template_name): def media_path(fp): - return os.path.join(os.path.join(settings.MEDIA_MEMBERLISTS, "memberlists"), fp) + return os.path.join(os.path.join(settings.MEDIA_ROOT, "memberlists"), fp) def media_dir(): - return os.path.join(settings.MEDIA_MEMBERLISTS, "memberlists") + return os.path.join(settings.MEDIA_ROOT, "memberlists") def serve_pdf(filename_pdf):