add start_date to talks

This commit is contained in:
Élie Bouttier 2016-10-11 11:33:37 +02:00
parent dad1f3babe
commit 74aa1b5bf4
4 changed files with 24 additions and 1 deletions

View File

@ -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'),

View File

@ -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),
),
]

View File

@ -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:

View File

@ -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()