add start_date to talks
This commit is contained in:
parent
dad1f3babe
commit
74aa1b5bf4
|
@ -30,7 +30,7 @@ class TalkForm(forms.ModelForm):
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Talk
|
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()}
|
widgets = {'topics': forms.CheckboxSelectMultiple(), 'speakers': Select2TagWidget()}
|
||||||
help_texts = {
|
help_texts = {
|
||||||
'abstract': _('Should be less than 255 characters'),
|
'abstract': _('Should be less than 255 characters'),
|
||||||
|
|
20
proposals/migrations/0017_talk_start_date.py
Normal file
20
proposals/migrations/0017_talk_start_date.py
Normal 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),
|
||||||
|
),
|
||||||
|
]
|
|
@ -112,6 +112,7 @@ class Talk(PonyConfModel):
|
||||||
notes = models.TextField(blank=True, verbose_name=_('Notes'))
|
notes = models.TextField(blank=True, verbose_name=_('Notes'))
|
||||||
event = models.ForeignKey(Event, verbose_name=_('Intervention kind'))
|
event = models.ForeignKey(Event, verbose_name=_('Intervention kind'))
|
||||||
accepted = models.NullBooleanField(default=None)
|
accepted = models.NullBooleanField(default=None)
|
||||||
|
start_date = models.DateTimeField(null=True, default=None)
|
||||||
duration = models.IntegerField(default=0, verbose_name=_('Duration (min)'))
|
duration = models.IntegerField(default=0, verbose_name=_('Duration (min)'))
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
|
|
|
@ -154,6 +154,7 @@ def talk_edit(request, talk=None):
|
||||||
if not talk.is_editable_by(request.user):
|
if not talk.is_editable_by(request.user):
|
||||||
form.fields.pop('track')
|
form.fields.pop('track')
|
||||||
form.fields.pop('duration')
|
form.fields.pop('duration')
|
||||||
|
form.fields.pop('start_date')
|
||||||
if not talk.is_moderable_by(request.user):
|
if not talk.is_moderable_by(request.user):
|
||||||
form.fields['title'].disabled = True
|
form.fields['title'].disabled = True
|
||||||
else:
|
else:
|
||||||
|
@ -161,6 +162,7 @@ def talk_edit(request, talk=None):
|
||||||
if not is_orga(request, request.user):
|
if not is_orga(request, request.user):
|
||||||
form.fields.pop('track')
|
form.fields.pop('track')
|
||||||
form.fields.pop('duration')
|
form.fields.pop('duration')
|
||||||
|
form.fields.pop('start_date')
|
||||||
if request.method == 'POST' and form.is_valid():
|
if request.method == 'POST' and form.is_valid():
|
||||||
if hasattr(talk, 'id'):
|
if hasattr(talk, 'id'):
|
||||||
talk = form.save()
|
talk = form.save()
|
||||||
|
|
Loading…
Reference in New Issue
Block a user