Merge pull request #102 from Katharineum/server

Server to dev

schoolapps/aub/migrations/0006_auto_20181219_1107.py

+# 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'),
+        ),
+    ]

schoolapps/aub/migrations/0007_merge_20190118_1452.py

+# Generated by Django 2.0.4 on 2019-01-18 13:52
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('aub', '0006_auto_20181219_1107'),
+        ('aub', '0006_merge_20190106_1714'),
+    ]
+
+    operations = [
+    ]

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:

materialize @ 5714e3b8

-Subproject commit 80e8ed370487aaf1e2185b028f7deda40da94eb9
+Subproject commit 5714e3b8821ba2cc6831064e7cb901e743e19b58

schoolapps/templates/partials/header.html

@@ -24,7 +24,8 @@
     <!-- JavaScript -->
     <!---------------->
     <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
-    <script src="{% static 'materialize/dist/js/materialize.min.js' %}"></script>
+    <!--<script src="{% static 'materialize/dist/js/materialize.min.js' %}"></script>-->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script>
     <script src="{% static 'common/helper.js' %}"></script>
     <!-- django-material -->
     {#    {% include 'material/includes/material_js.html' %}#}
@@ -180,4 +181,4 @@
         Problemen kommen. Es würde uns sehr helfen, wenn du uns dann über
         <a href="mailto:support@katharineum.de">support@katharineum.de</a> schreibst.
     </p>
-</header>
\ No newline at end of file
+</header>