settings: remove MEDIA_MEMBERLISTS and use MEDIA_ROOT everywhere

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'

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)

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):