From 74aa1b5bf400e692b224df59ccdeb95ebe2927d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lie=20Bouttier?= Date: Tue, 11 Oct 2016 11:33:37 +0200 Subject: [PATCH] add start_date to talks --- proposals/forms.py | 2 +- proposals/migrations/0017_talk_start_date.py | 20 ++++++++++++++++++++ proposals/models.py | 1 + proposals/views.py | 2 ++ 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 proposals/migrations/0017_talk_start_date.py diff --git a/proposals/forms.py b/proposals/forms.py index 05932be..2a1e51e 100644 --- a/proposals/forms.py +++ b/proposals/forms.py @@ -30,7 +30,7 @@ class TalkForm(forms.ModelForm): class Meta: model = Talk - fields = ['title', 'abstract', 'description', 'topics', 'track', 'notes', 'event', 'duration', 'speakers'] + fields = ['title', 'abstract', 'description', 'topics', 'track', 'notes', 'event', 'speakers', 'duration', 'start_date'] widgets = {'topics': forms.CheckboxSelectMultiple(), 'speakers': Select2TagWidget()} help_texts = { 'abstract': _('Should be less than 255 characters'), diff --git a/proposals/migrations/0017_talk_start_date.py b/proposals/migrations/0017_talk_start_date.py new file mode 100644 index 0000000..95cdcdd --- /dev/null +++ b/proposals/migrations/0017_talk_start_date.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-10-10 22:12 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('proposals', '0016_auto_20161005_2027'), + ] + + operations = [ + migrations.AddField( + model_name='talk', + name='start_date', + field=models.DateTimeField(default=None, null=True), + ), + ] diff --git a/proposals/models.py b/proposals/models.py index efee091..7200806 100644 --- a/proposals/models.py +++ b/proposals/models.py @@ -112,6 +112,7 @@ class Talk(PonyConfModel): notes = models.TextField(blank=True, verbose_name=_('Notes')) event = models.ForeignKey(Event, verbose_name=_('Intervention kind')) accepted = models.NullBooleanField(default=None) + start_date = models.DateTimeField(null=True, default=None) duration = models.IntegerField(default=0, verbose_name=_('Duration (min)')) class Meta: diff --git a/proposals/views.py b/proposals/views.py index 28c1d3b..2c83441 100644 --- a/proposals/views.py +++ b/proposals/views.py @@ -154,6 +154,7 @@ def talk_edit(request, talk=None): if not talk.is_editable_by(request.user): form.fields.pop('track') form.fields.pop('duration') + form.fields.pop('start_date') if not talk.is_moderable_by(request.user): form.fields['title'].disabled = True else: @@ -161,6 +162,7 @@ def talk_edit(request, talk=None): if not is_orga(request, request.user): form.fields.pop('track') form.fields.pop('duration') + form.fields.pop('start_date') if request.method == 'POST' and form.is_valid(): if hasattr(talk, 'id'): talk = form.save()