From fe8152ab091bda761eb0321ce664624eb04d5741 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Mon, 14 Jun 2021 14:42:36 +0200 Subject: [PATCH] Athorize empty questions --- .../migrations/0027_auto_20210614_1123.py | 23 +++++++++++++++++++ elections/models.py | 4 +++- elections/templates/elections/election.html | 7 +++++- .../templates/elections/election_admin.html | 7 +++++- 4 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 elections/migrations/0027_auto_20210614_1123.py diff --git a/elections/migrations/0027_auto_20210614_1123.py b/elections/migrations/0027_auto_20210614_1123.py new file mode 100644 index 0000000..60b06e5 --- /dev/null +++ b/elections/migrations/0027_auto_20210614_1123.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.4 on 2021-06-14 09:23 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("elections", "0026_auto_20210529_2246"), + ] + + operations = [ + migrations.AlterField( + model_name="question", + name="text_en", + field=models.TextField(blank=True, default="", verbose_name="question"), + ), + migrations.AlterField( + model_name="question", + name="text_fr", + field=models.TextField(blank=True, default="", verbose_name="question"), + ), + ] diff --git a/elections/models.py b/elections/models.py index 3d4fda0..cc66bc0 100644 --- a/elections/models.py +++ b/elections/models.py @@ -81,7 +81,9 @@ class Question(models.Model): election = models.ForeignKey( Election, related_name="questions", on_delete=models.CASCADE ) - text = TranslatedFieldWithFallback(models.TextField(_("question"), blank=False)) + text = TranslatedFieldWithFallback( + models.TextField(_("question"), blank=True, default="") + ) type = models.CharField( _("type de question"), choices=QUESTION_TYPES, diff --git a/elections/templates/elections/election.html b/elections/templates/elections/election.html index af4bdc2..b9143d5 100644 --- a/elections/templates/elections/election.html +++ b/elections/templates/elections/election.html @@ -181,7 +181,12 @@
- {{ q }} + + + + + {{ q }} +
{% if q in cast_questions %} diff --git a/elections/templates/elections/election_admin.html b/elections/templates/elections/election_admin.html index 0d492c0..611052d 100644 --- a/elections/templates/elections/election_admin.html +++ b/elections/templates/elections/election_admin.html @@ -195,7 +195,12 @@
- {{ q }} + + + + + {{ q }} +
{% if election.start_date > current_time %}