long or short conferences

ponyconf/utils.py

@@ -2,7 +2,7 @@ from django.contrib.sites.shortcuts import get_current_site
 
 
 def enum_to_choices(enum):
-    return ((item.value, item.name) for item in list(enum))
+    return ((item.value, item.name.replace('_', ' ')) for item in list(enum))
 
 
 def full_link(obj, request=None):

proposals/migrations/0003_auto_20160625_1037.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-06-25 10:37
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('proposals', '0002_topic_reviewers'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='talk',
+            name='event',
+            field=models.IntegerField(choices=[(1, 'conference short'), (2, 'conference long'), (3, 'workshop'), (4, 'stand'), (5, 'other')], default=1),
+        ),
+    ]

proposals/models.py

@@ -30,7 +30,7 @@ class Topic(models.Model):
 
 class Talk(models.Model):
 
-    EVENTS = IntEnum('Event', 'conference workshop stand other')
+    EVENTS = IntEnum('Event', 'conference_short conference_long workshop stand other')
 
     site = models.ForeignKey(Site, on_delete=models.CASCADE)
 
@@ -40,7 +40,7 @@ class Talk(models.Model):
     slug = AutoSlugField(populate_from='title', unique=True)
     description = models.TextField(blank=True, verbose_name='Description')
     topics = models.ManyToManyField(Topic, blank=True)
-    event = models.IntegerField(choices=enum_to_choices(EVENTS), default=EVENTS.conference.value)
+    event = models.IntegerField(choices=enum_to_choices(EVENTS), default=EVENTS.conference_short.value)
 
     objects = models.Manager()
     on_site = CurrentSiteManager()