Skip to content
Snippets Groups Projects
Commit 3ad6ed5a authored by root's avatar root
Browse files

BASE_DIR bug

parent 0fb4ff65
No related branches found
No related tags found
1 merge request!86Merge school-apps
# 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'),
),
]
......@@ -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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment