Merge pull request #65 from Katharineum/server

Server to dev

schoolapps/aub/migrations/0004_auto_20181031_1617.py

+# Generated by Django 2.0.4 on 2018-10-31 15:17
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('aub', '0003_auto_20181031_1551'),
+    ]
+
+    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),
+        ),
+    ]

schoolapps/untisconnect/sub.py

@@ -181,6 +181,8 @@ def generate_subject_row(sub, full=False):
             sub.subject_new.shortcode if not full else sub.subject_new.name)
     elif sub.subject_new and not sub.subject_old:
         subject = "<strong>{}</strong>".format(sub.subject_new.shortcode if not full else sub.subject_new.name)
+    elif not sub.subject_new and not sub.subject_old:
+        subject = ""
     else:
         subject = "<strong>{}</strong>".format(sub.subject_old.shortcode if not full else sub.subject_old.name)