Compare commits
3 commits
d937804737
...
f6c4c732d6
Author | SHA1 | Date | |
---|---|---|---|
Casper V. Kristensen | f6c4c732d6 | ||
Casper V. Kristensen | 3f8ed2c4ce | ||
Casper V. Kristensen | 8012162b2b |
|
@ -4,6 +4,7 @@
|
||||||
|
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
|
<h2>Bank</h2>
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-header d-flex">
|
<div class="card-header d-flex">
|
||||||
<div class="nav nav-tabs card-header-tabs mr-auto">
|
<div class="nav nav-tabs card-header-tabs mr-auto">
|
||||||
|
|
21
drakul/raids/migrations/0006_auto_20200417_0854.py
Normal file
21
drakul/raids/migrations/0006_auto_20200417_0854.py
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
# 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),
|
||||||
|
),
|
||||||
|
]
|
|
@ -141,7 +141,7 @@ class RaidComment(models.Model):
|
||||||
user = models.ForeignKey(
|
user = models.ForeignKey(
|
||||||
settings.AUTH_USER_MODEL,
|
settings.AUTH_USER_MODEL,
|
||||||
related_name="raid_comments",
|
related_name="raid_comments",
|
||||||
on_delete=models.PROTECT,
|
on_delete=models.CASCADE,
|
||||||
)
|
)
|
||||||
|
|
||||||
body = models.TextField(
|
body = models.TextField(
|
||||||
|
|
|
@ -19,6 +19,7 @@ User = get_user_model()
|
||||||
|
|
||||||
|
|
||||||
class RaidCalendar(MonthArchiveView):
|
class RaidCalendar(MonthArchiveView):
|
||||||
|
queryset = Raid.objects.all()
|
||||||
allow_empty = True
|
allow_empty = True
|
||||||
allow_future = True
|
allow_future = True
|
||||||
date_field = "date"
|
date_field = "date"
|
||||||
|
@ -27,11 +28,12 @@ class RaidCalendar(MonthArchiveView):
|
||||||
template_name_suffix = "_calendar"
|
template_name_suffix = "_calendar"
|
||||||
|
|
||||||
def get_queryset(self):
|
def get_queryset(self):
|
||||||
if not self.request.user.is_authenticated:
|
queryset = super().get_queryset()
|
||||||
return Raid.objects.all()
|
if self.request.user.is_authenticated:
|
||||||
return Raid.objects.annotate(
|
queryset = queryset.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):
|
def get_dated_queryset(self, **lookup):
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in a new issue