drakul/bank/templates/bank/base.html

@@ -4,7 +4,6 @@
 
 
 {% block content %}
-<h2>Bank</h2>
 <div class="card">
     <div class="card-header d-flex">
         <div class="nav nav-tabs card-header-tabs mr-auto">

drakul/raids/migrations/0006_auto_20200417_0854.py

@@ -1,21 +0,0 @@
-# Generated by Django 3.0.2 on 2020-04-17 08:54
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('raids', '0005_auto_20200106_2305'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='raidcomment',
-            name='user',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='raid_comments', to=settings.AUTH_USER_MODEL),
-        ),
-    ]

drakul/raids/models.py

@@ -141,7 +141,7 @@ class RaidComment(models.Model):
     user = models.ForeignKey(
         settings.AUTH_USER_MODEL,
         related_name="raid_comments",
-        on_delete=models.CASCADE,
+        on_delete=models.PROTECT,
     )
 
     body = models.TextField(

drakul/raids/views.py

@@ -19,7 +19,6 @@ User = get_user_model()
 
 
 class RaidCalendar(MonthArchiveView):
-    queryset = Raid.objects.all()
     allow_empty = True
     allow_future = True
     date_field = "date"
@@ -28,12 +27,11 @@ class RaidCalendar(MonthArchiveView):
     template_name_suffix = "_calendar"
 
     def get_queryset(self):
-        queryset = super().get_queryset()
+        if not self.request.user.is_authenticated:
-        if self.request.user.is_authenticated:
+            return Raid.objects.all()
-            queryset = queryset.annotate(
+        return Raid.objects.annotate(
-                max_status=Max("responses__status", filter=Q(responses__character__user=self.request.user))
+            max_status=Max("responses__status", filter=Q(responses__character__user=self.request.user))
-            )
+        )
-        return queryset
 
     def get_dated_queryset(self, **lookup):
         """