From 660c1e75e6ba74cd80e0c953d32959ec005ebc22 Mon Sep 17 00:00:00 2001 From: "Casper V. Kristensen" Date: Fri, 25 Oct 2019 13:26:42 +0200 Subject: [PATCH] Rename "signup deadline" -> "response deadline." --- drakul/raids/admin.py | 2 +- drakul/raids/forms.py | 4 ++-- drakul/raids/migrations/0001_initial.py | 6 +++--- ...0191025_0158.py => 0002_auto_20191025_1323.py} | 2 +- drakul/raids/models.py | 15 +++++++++------ drakul/raids/templates/raids/raid_detail.html | 2 +- drakul/raids/views.py | 2 +- 7 files changed, 18 insertions(+), 15 deletions(-) rename drakul/raids/migrations/{0002_auto_20191025_0158.py => 0002_auto_20191025_1323.py} (96%) diff --git a/drakul/raids/admin.py b/drakul/raids/admin.py index c20aa72..76944fb 100755 --- a/drakul/raids/admin.py +++ b/drakul/raids/admin.py @@ -18,7 +18,7 @@ class RaidCommentInline(admin.TabularInline): @admin.register(Raid) class RaidAdmin(admin.ModelAdmin): - list_display = ["title", "date", "signup_deadline"] + list_display = ["title", "date", "response_deadline"] search_fields = ["title"] inlines = [RaidResponseInline, RaidCommentInline] diff --git a/drakul/raids/forms.py b/drakul/raids/forms.py index 53afb04..e787210 100644 --- a/drakul/raids/forms.py +++ b/drakul/raids/forms.py @@ -63,7 +63,7 @@ class RaidResponseForm(ModelForm): class RaidForm(ModelForm): class Meta: model = Raid - fields = ["title", "description", "date", "signup_deadline"] + fields = ["title", "description", "date", "response_deadline"] def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) @@ -78,7 +78,7 @@ class RaidForm(ModelForm): Field("description"), Row( Column("date", css_class="form-group col-md-6"), - Column("signup_deadline", css_class="form-group col-md-6"), + Column("response_deadline", css_class="form-group col-md-6"), ), submit_button ) diff --git a/drakul/raids/migrations/0001_initial.py b/drakul/raids/migrations/0001_initial.py index bd53a13..29baeb3 100644 --- a/drakul/raids/migrations/0001_initial.py +++ b/drakul/raids/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.6 on 2019-10-25 01:58 +# Generated by Django 2.2.6 on 2019-10-25 13:23 from django.db import migrations, models @@ -17,7 +17,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=100, unique=True)), ('date', models.DateField(help_text='Some date where the instance was reset in the past.')), - ('time', models.TimeField()), + ('time', models.TimeField(help_text='The time of day where the instance resets.')), ('duration', models.DurationField(help_text='Resets are calculated from the given date in intervals of this duration.', verbose_name='lockout duration')), ], options={ @@ -31,7 +31,7 @@ class Migration(migrations.Migration): ('title', models.CharField(max_length=40)), ('description', models.TextField(blank=True, null=True)), ('date', models.DateTimeField()), - ('signup_deadline', models.DateTimeField(blank=True, help_text='Defaults to date and time of raid if not set.')), + ('response_deadline', models.DateTimeField(blank=True, help_text='Defaults to 24 hours before date and time of raid if not set.')), ], options={ 'ordering': ['-date'], diff --git a/drakul/raids/migrations/0002_auto_20191025_0158.py b/drakul/raids/migrations/0002_auto_20191025_1323.py similarity index 96% rename from drakul/raids/migrations/0002_auto_20191025_0158.py rename to drakul/raids/migrations/0002_auto_20191025_1323.py index 4005d66..312fce2 100644 --- a/drakul/raids/migrations/0002_auto_20191025_0158.py +++ b/drakul/raids/migrations/0002_auto_20191025_1323.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.6 on 2019-10-25 01:58 +# Generated by Django 2.2.6 on 2019-10-25 13:23 from django.conf import settings from django.db import migrations, models diff --git a/drakul/raids/models.py b/drakul/raids/models.py index 0794f6d..cb23821 100755 --- a/drakul/raids/models.py +++ b/drakul/raids/models.py @@ -1,3 +1,5 @@ +from datetime import timedelta + from django.conf import settings from django.core.exceptions import ValidationError from django.db import models @@ -16,18 +18,19 @@ class Raid(models.Model): ) date = models.DateTimeField() - signup_deadline = models.DateTimeField( + response_deadline = models.DateTimeField( blank=True, - help_text="Defaults to date and time of raid if not set." + help_text="Defaults to 24 hours before date and time of raid if not set." ) class Meta: ordering = ["-date"] - def clean(self): - # Set the signup deadline to the date/time of the raid if it hasn't been set already - if self.signup_deadline is None: - self.signup_deadline = self.date + def save(self, *args, **kwargs): + if self.response_deadline is None: + self.response_deadline = self.date - timedelta(hours=24) + + return super().save(*args, **kwargs) def __str__(self): return f"{self.title} on {self.date}" diff --git a/drakul/raids/templates/raids/raid_detail.html b/drakul/raids/templates/raids/raid_detail.html index 2f7d593..bad5613 100644 --- a/drakul/raids/templates/raids/raid_detail.html +++ b/drakul/raids/templates/raids/raid_detail.html @@ -15,7 +15,7 @@

{{ raid.description | linebreaksbr | default:"No description" }}

-

Sign up deadline: {{ raid.signup_deadline }}

+

Response deadline: {{ raid.response_deadline }}

{% if response_form %} diff --git a/drakul/raids/views.py b/drakul/raids/views.py index 6e7a301..15bb9ad 100644 --- a/drakul/raids/views.py +++ b/drakul/raids/views.py @@ -83,7 +83,7 @@ class RaidDetailView(SingleObjectMixin, MultiModelFormView): classes = { "comment_form": RaidCommentForm } - if self.object.signup_deadline > timezone.now(): + if self.object.response_deadline > timezone.now(): classes["response_form"] = RaidResponseForm return classes