diff --git a/schoolapps/aub/migrations/0006_auto_20181219_1107.py b/schoolapps/aub/migrations/0006_auto_20181219_1107.py new file mode 100644 index 0000000000000000000000000000000000000000..2d7f31b40958a64aca6d96a9f65405a1bd784675 --- /dev/null +++ b/schoolapps/aub/migrations/0006_auto_20181219_1107.py @@ -0,0 +1,24 @@ +# Generated by Django 2.0.4 on 2018-12-19 10:07 + +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('aub', '0005_auto_20181128_1709'), + ] + + operations = [ + migrations.AlterField( + model_name='aub', + name='created_by', + field=models.ForeignKey(default=1, on_delete=models.SET(1), related_name='aubs', to=settings.AUTH_USER_MODEL), + ), + migrations.AlterField( + model_name='aub', + name='status', + field=models.ForeignKey(default=7, on_delete=models.SET(7), related_name='aubs', to='aub.Status'), + ), + ] diff --git a/schoolapps/menu/views.py b/schoolapps/menu/views.py index b56d6ff054fc31fe8deeeaeed2784061a2121fad..d8764dc6e05273e1be4908e5af24701664d4b234 100644 --- a/schoolapps/menu/views.py +++ b/schoolapps/menu/views.py @@ -7,6 +7,7 @@ from django.shortcuts import render, redirect from django.utils import timezone from menu.models import Menu +from schoolapps.settings import BASE_DIR from .forms import MenuUploadForm @@ -52,7 +53,7 @@ def return_pdf(filename): def return_default_pdf(): """Response the default PDF""" - return return_pdf(os.path.join("menu", "default.pdf")) + return return_pdf(os.path.join(BASE_DIR, "menu", "default.pdf")) def show_current(request): @@ -76,7 +77,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("media", str(obj.pdf))) + return return_pdf(os.path.join(BASE_DIR, "media", str(obj.pdf))) # Or show the default PDF except Menu.DoesNotExist: