From 56bb1c1e9bf2f794d42a1646e7199752e3c7f31b Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Tue, 14 Jan 2020 20:29:44 +0100
Subject: [PATCH] Update paths
---
aleksis/apps/mensa/admin.py | 2 +-
aleksis/apps/mensa/forms.py | 2 +-
aleksis/apps/mensa/models.py | 2 +-
aleksis/apps/mensa/views.py | 8 ++++----
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/aleksis/apps/mensa/admin.py b/aleksis/apps/mensa/admin.py
index 791aaba..08d4672 100644
--- a/aleksis/apps/mensa/admin.py
+++ b/aleksis/apps/mensa/admin.py
@@ -1,6 +1,6 @@
from django.contrib import admin
# Register your models here.
-from menu.models import Menu
+from .models import Menu
admin.site.register(Menu)
diff --git a/aleksis/apps/mensa/forms.py b/aleksis/apps/mensa/forms.py
index a1c0777..7e6b47d 100644
--- a/aleksis/apps/mensa/forms.py
+++ b/aleksis/apps/mensa/forms.py
@@ -2,7 +2,7 @@ from django import forms
from django.core.validators import FileExtensionValidator
from django.utils import timezone
-from menu.models import Menu
+from .models import Menu
current_year = timezone.datetime.now().year
options_for_year = [(current_year, current_year),
diff --git a/aleksis/apps/mensa/models.py b/aleksis/apps/mensa/models.py
index 35fe9b7..2ce9203 100644
--- a/aleksis/apps/mensa/models.py
+++ b/aleksis/apps/mensa/models.py
@@ -1,7 +1,7 @@
from django.db import models
# Create your models here.
-from utils.helper import path_and_rename
+from aleksis.core.util.helper import path_and_rename
class Menu(models.Model):
diff --git a/aleksis/apps/mensa/views.py b/aleksis/apps/mensa/views.py
index ba9effb..38da521 100644
--- a/aleksis/apps/mensa/views.py
+++ b/aleksis/apps/mensa/views.py
@@ -7,8 +7,8 @@ from django.http import FileResponse
from django.shortcuts import render, redirect
from django.utils import timezone
-from menu.models import Menu
-from schoolapps.settings import BASE_DIR
+from .models import Menu
+from django.conf import settings
from .forms import MenuUploadForm
@@ -54,7 +54,7 @@ def return_pdf(filename):
def return_default_pdf():
"""Response the default PDF"""
- return return_pdf(os.path.join(BASE_DIR, "menu", "default.pdf"))
+ return return_pdf(os.path.join(settings.BASE_DIR, "menu", "default.pdf"))
def show_current(request):
@@ -81,7 +81,7 @@ def show_current(request):
# Look for matching PDF in DB
try:
obj = Menu.objects.get(year=year, calendar_week=calendar_week)
- return return_pdf(os.path.join(BASE_DIR, "media", str(obj.pdf)))
+ return return_pdf(os.path.join(settings.MEDIA_ROOT, str(obj.pdf)))
# Or show the default PDF
except Menu.DoesNotExist:
--
GitLab