diff --git a/proposals/forms.py b/proposals/forms.py index e905cc9..9f35612 100644 --- a/proposals/forms.py +++ b/proposals/forms.py @@ -120,4 +120,4 @@ class TopicForm(forms.ModelForm): return name -ConferenceForm = modelform_factory(Conference, fields=['home']) +ConferenceForm = modelform_factory(Conference, fields=['cfp', 'home']) diff --git a/proposals/migrations/0013_conference_cfp.py b/proposals/migrations/0013_conference_cfp.py new file mode 100644 index 0000000..7c649a1 --- /dev/null +++ b/proposals/migrations/0013_conference_cfp.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-09-24 12:08 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('proposals', '0012_topic_track'), + ] + + operations = [ + migrations.AddField( + model_name='conference', + name='cfp', + field=models.IntegerField(choices=[(0, 'Forthcoming (closed)'), (1, 'Open'), (2, 'Completed (closed)')], default=0), + ), + ] diff --git a/proposals/models.py b/proposals/models.py index d7cb8ec..496637e 100644 --- a/proposals/models.py +++ b/proposals/models.py @@ -18,8 +18,18 @@ from .utils import query_sum class Conference(models.Model): - site = models.OneToOneField(Site, on_delete=models.CASCADE) + CFP_FORTHCOMING = 0 + CFP_OPEN = 1 + CFP_COMPLETED = 2 + CFP_CHOICES = [ + (CFP_FORTHCOMING, _('Forthcoming (closed)')), + (CFP_OPEN, _('Open')), + (CFP_COMPLETED, _('Completed (closed)')), + ] + + site = models.OneToOneField(Site, on_delete=models.CASCADE, related_name='conference') home = models.TextField(blank=True, default="") + cfp = models.IntegerField(choices=CFP_CHOICES, default=0, verbose_name=_('Call for Participation')) def __str__(self): return str(self.site) diff --git a/proposals/templates/proposals/conference.html b/proposals/templates/proposals/conference.html index ccdc890..c472078 100644 --- a/proposals/templates/proposals/conference.html +++ b/proposals/templates/proposals/conference.html @@ -2,39 +2,38 @@ {% load bootstrap3 staticfiles i18n %} -{% block talktab %} class="active"{% endblock %} +{% block admintab %} class="active"{% endblock %} {% block content %} -