Add missing migration

aleksis/apps/ticdesk/menus.py

@@ -19,7 +19,7 @@ MENUS = {
                     "validators": [
                         (
                             "aleksis.core.util.predicates.permission_validator",
-                            "ticdesk.edit_voucher",
+                            "ticdesk.edit_vouchers",
                         )
                     ],
                 },
@@ -30,7 +30,7 @@ MENUS = {
                     "validator": [
                         (
                             "aleksis.core.util.predicates.permission_validator",
-                            "ticdesk.create_voucher",
+                            "ticdesk.create_vouchers",
                         )
                     ],
                 },
@@ -42,7 +42,7 @@ MENUS = {
             "icon": "event_note",
             "root": True,
             "validators": [
-                ("aleksis.core.util.predicates.permission_validator", "ticdesk.edit_event",)
+                ("aleksis.core.util.predicates.permission_validator", "ticdesk.edit_events",)
             ],
             "submenu": [
                 {
@@ -83,7 +83,7 @@ MENUS = {
                     "url": "manage_events",
                     "icon": "edit",
                     "validators": [
-                        ("aleksis.core.util.predicates.permission_validator", "ticdesk.edit_event",)
+                        ("aleksis.core.util.predicates.permission_validator", "ticdesk.edit_events",)
                     ],
                 },
                 {

aleksis/apps/ticdesk/migrations/0022_feedback.py

+# Generated by Django 3.1.7 on 2021-04-05 17:42
+
+import django.contrib.sites.managers
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sites', '0002_alter_domain_unique'),
+        ('core', '0010_external_link_widget'),
+        ('ticdesk', '0021_teckidsevent_display_name'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='globalpermissions',
+            options={'managed': False, 'permissions': (('view_voucher', 'Can view vouchers'), ('edit_voucher', 'Can edit vouchers'), ('delete_voucher', 'Can delete vouchers'), ('create_voucher', 'Can create vouchers'), ('edit_event', 'Can edit events'), ('create_event', 'Can create events'), ('delete_event', 'Can delete events'), ('generate_list', 'Can generate lists'), ('manage_registration', 'Can manage registrations'), ('view_registration', 'Can view registrations'))},
+        ),
+        migrations.AddField(
+            model_name='teckidsevent',
+            name='short_name',
+            field=models.CharField(default='', max_length=255, verbose_name='Short name'),
+        ),
+        migrations.AlterField(
+            model_name='eventregistration',
+            name='channel',
+            field=models.CharField(blank=True, default='', max_length=255, verbose_name='Channel'),
+        ),
+        migrations.AlterField(
+            model_name='eventregistration',
+            name='comment',
+            field=models.TextField(blank=True, default='', verbose_name='Comment / remarks'),
+        ),
+        migrations.AlterField(
+            model_name='voucher',
+            name='code',
+            field=models.CharField(blank=True, default='', max_length=8),
+        ),
+        migrations.CreateModel(
+            name='EventFeedback',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('extended_data', models.JSONField(default=dict, editable=False)),
+                ('comment_private', models.TextField(blank=True, verbose_name='Private comment')),
+                ('comment_public', models.TextField(blank=True, verbose_name='Public comment')),
+                ('comment_public_info', models.CharField(choices=[('first', 'Only first name'), ('first_age', 'First name and age'), ('first_last_age', 'First name, last name and age')], max_length=255, verbose_name='Information in the comment')),
+                ('photos', models.ImageField(blank=True, upload_to='feedback/', verbose_name='Photos')),
+                ('photos_licence', models.CharField(choices=[('CC-BY-4.0+', 'Creative Commons with attribution, 4.0 or later'), ('CC-BY-SA-4.0+', 'Creative Commons with attribution and distribution onlyunder the same conditions, 4.0 or later')], max_length=255, verbose_name='Photo licence')),
+                ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='feedback', to='ticdesk.teckidsevent', verbose_name='Event')),
+                ('person', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='feedback', to='core.person', verbose_name='Person')),
+                ('site', models.ForeignKey(default=1, editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.site')),
+            ],
+            options={
+                'verbose_name': 'Event feedback',
+                'verbose_name_plural': 'Event feedbacks',
+            },
+            managers=[
+                ('objects', django.contrib.sites.managers.CurrentSiteManager()),
+            ],
+        ),
+    ]

aleksis/apps/ticdesk/models.py

@@ -52,6 +52,7 @@ class TeckidsEvent(ExtensibleModel):
 
     # Event details
     display_name = models.CharField(verbose_name=_("Display name"), max_length=255, default="")
+    short_name = models.CharField(verbose_name=_("Short name"), max_length=255, default="")
     group = models.ForeignKey(
         Group, on_delete=models.CASCADE, verbose_name=_("Group"), related_name="event"
     )
@@ -137,11 +138,11 @@ class EventFeedback(ExtensibleModel):
     comment_private = models.TextField(verbose_name=_("Private comment"), blank=True)
     comment_public = models.TextField(verbose_name=_("Public comment"), blank=True)
     comment_public_info = models.CharField(
-        choices=COMMENT_CHOICES, verbose_name=_("Information in the comment")
+        choices=COMMENT_CHOICES, verbose_name=_("Information in the comment"), max_length=255
     )
 
     photos = models.ImageField(verbose_name=_("Photos"), upload_to="feedback/", blank=True)
-    photos_licence = models.CharField(choices=LICENCE_CHOICES, verbose_name=_("Photo licence"))
+    photos_licence = models.CharField(choices=LICENCE_CHOICES, verbose_name=_("Photo licence"), max_length=255)
 
 
 class Voucher(ExtensibleModel):
@@ -149,7 +150,7 @@ class Voucher(ExtensibleModel):
         verbose_name = _("Vouchers")
         verbose_name_plural = _("Vouchers")
 
-    code = models.CharField(max_length=8, blank=True)
+    code = models.CharField(max_length=8, blank=True, default="")
     event = models.ForeignKey(
         TeckidsEvent,
         related_name="vouchers",
@@ -205,8 +206,8 @@ class EventRegistration(ExtensibleModel):
     person = models.ForeignKey(Person, on_delete=models.CASCADE, verbose_name=_("Person"))
     date_registred = models.DateTimeField(auto_now_add=True, verbose_name=_("Registration date"))
 
-    comment = models.TextField(verbose_name=_("Comment / remarks"), blank=True)
-    channel = models.CharField(verbose_name=_("Channel"), max_length=255, blank=True)
+    comment = models.TextField(verbose_name=_("Comment / remarks"), blank=True, default="")
+    channel = models.CharField(verbose_name=_("Channel"), max_length=255, blank=True, default="")
     voucher = models.ForeignKey(
         Voucher, on_delete=models.CASCADE, verbose_name=_("Voucher"), blank=True, null=True,
     )