From 1ce3c28e945682e4500d858eb0abe37640ffeb98 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Sun, 10 Nov 2019 20:26:28 +0200 Subject: [PATCH] Use JSONField for signup and signupform models --- webapp/migrations/0061_auto_20191110_2024.py | 29 ++++++++++++++++++++ webapp/models.py | 7 ++--- 2 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 webapp/migrations/0061_auto_20191110_2024.py diff --git a/webapp/migrations/0061_auto_20191110_2024.py b/webapp/migrations/0061_auto_20191110_2024.py new file mode 100644 index 0000000..aebdfe1 --- /dev/null +++ b/webapp/migrations/0061_auto_20191110_2024.py @@ -0,0 +1,29 @@ +# Generated by Django 2.1.5 on 2019-11-10 18:24 + +import django.contrib.postgres.fields.jsonb +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('webapp', '0060_official_image'), + ] + + operations = [ + migrations.AlterField( + model_name='official', + name='image', + field=models.ImageField(blank=True, null=True, upload_to=''), + ), + migrations.AlterField( + model_name='signup', + name='answer', + field=django.contrib.postgres.fields.jsonb.JSONField(), + ), + migrations.AlterField( + model_name='signupform', + name='questions', + field=django.contrib.postgres.fields.jsonb.JSONField(), + ), + ] diff --git a/webapp/models.py b/webapp/models.py index 520af45..7e23446 100644 --- a/webapp/models.py +++ b/webapp/models.py @@ -10,7 +10,7 @@ from webapp.utils import month_from_now from django.utils.translation import ugettext_lazy as _ from auditlog.registry import auditlog from phonenumber_field.modelfields import PhoneNumberField -# from django.contrib.postgres.fields import JSONField +from django.contrib.postgres.fields import JSONField # import logging @@ -95,8 +95,7 @@ class SignupForm(models.Model): title = models.CharField(max_length=255) start_time = models.DateTimeField(default=timezone.now) end_time = models.DateTimeField(default=timezone.now) - # question = JSONField() - questions = models.TextField(default="[]") + questions = JSONField() visible = models.BooleanField(default=True) def __str__(self): @@ -110,7 +109,7 @@ class SignupForm(models.Model): class Signup(models.Model): signupForm = models.ForeignKey('SignupForm', on_delete=models.CASCADE) time = models.DateTimeField(default=timezone.now) - answer = models.CharField(max_length=255) + answer = JSONField() def __str__(self): return _('Sign-ups: {}').format(self.signupForm)