From ba56e79887d387e9f2444d6d4a4c2e5d2ba59595 Mon Sep 17 00:00:00 2001 From: Marcel Schwarz Date: Wed, 17 Aug 2022 17:13:40 +0200 Subject: [PATCH] Tobacco is in stock by default, make voting lockable --- clubhaus/homepage/admin.py | 4 ++-- ...nt_voting_locked_alter_tobacco_in_stock.py | 23 +++++++++++++++++++ clubhaus/homepage/models.py | 3 ++- .../homepage/templates/homepage/events.html | 11 +++++---- 4 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 clubhaus/homepage/migrations/0019_clubhausevent_voting_locked_alter_tobacco_in_stock.py diff --git a/clubhaus/homepage/admin.py b/clubhaus/homepage/admin.py index 4a4c645..8a1a73f 100644 --- a/clubhaus/homepage/admin.py +++ b/clubhaus/homepage/admin.py @@ -43,8 +43,8 @@ class EventDateInline(admin.StackedInline): @admin.register(ClubhausEvent) class ClubhausEventAdmin(admin.ModelAdmin): - list_display = ("id", "name", "date", "active") - list_editable = ('active',) + list_display = ("id", "name", "date", "active", "voting_locked") + list_editable = ('active', "voting_locked") ordering = ("date",) inlines = [ EventDateInline diff --git a/clubhaus/homepage/migrations/0019_clubhausevent_voting_locked_alter_tobacco_in_stock.py b/clubhaus/homepage/migrations/0019_clubhausevent_voting_locked_alter_tobacco_in_stock.py new file mode 100644 index 0000000..b80eb2f --- /dev/null +++ b/clubhaus/homepage/migrations/0019_clubhausevent_voting_locked_alter_tobacco_in_stock.py @@ -0,0 +1,23 @@ +# Generated by Django 4.0.7 on 2022-08-17 15:04 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('homepage', '0018_eventdatevotes_available'), + ] + + operations = [ + migrations.AddField( + model_name='clubhausevent', + name='voting_locked', + field=models.BooleanField(default=False), + ), + migrations.AlterField( + model_name='tobacco', + name='in_stock', + field=models.BooleanField(default=True), + ), + ] diff --git a/clubhaus/homepage/models.py b/clubhaus/homepage/models.py index bed190b..4d652ef 100644 --- a/clubhaus/homepage/models.py +++ b/clubhaus/homepage/models.py @@ -15,7 +15,7 @@ class Tobacco(models.Model): name = models.CharField(max_length=200, unique=True, blank=False, null=False) description = models.TextField(blank=True, null=False) category = models.ForeignKey("TobaccoCategory", on_delete=models.CASCADE, blank=False, null=False) - in_stock = models.BooleanField() + in_stock = models.BooleanField(default=True) picture = models.ImageField(upload_to="tobacco_images/", null=False, blank=True) def __str__(self): @@ -34,6 +34,7 @@ class ClubhausEvent(models.Model): name = models.CharField(max_length=200, blank=True) date = models.DateTimeField(blank=True, null=True) active = models.BooleanField(default=False) + voting_locked = models.BooleanField(default=False) location = models.TextField(blank=True) beverages = models.TextField(blank=True) food = models.TextField(blank=True) diff --git a/clubhaus/homepage/templates/homepage/events.html b/clubhaus/homepage/templates/homepage/events.html index ea0e429..0e639d2 100644 --- a/clubhaus/homepage/templates/homepage/events.html +++ b/clubhaus/homepage/templates/homepage/events.html @@ -131,10 +131,13 @@ {% else %}

Es hat noch keiner abgestimmt!

{% endif %} - + {% if not next_event.voting_locked %} + + {% endif %}