diff --git a/cfp/forms.py b/cfp/forms.py index 666a290..0ea6d62 100644 --- a/cfp/forms.py +++ b/cfp/forms.py @@ -28,7 +28,6 @@ class TalkForm(forms.ModelForm): def __init__(self, *args, **kwargs): categories = kwargs.pop('categories') super().__init__(*args, **kwargs) - self.fields['materials'].required = False if categories.exists(): self.fields['category'].queryset = categories else: @@ -36,7 +35,7 @@ class TalkForm(forms.ModelForm): class Meta: model = Talk - fields = ('category', 'title', 'description','notes') + fields = ('category', 'title', 'description', 'notes') class TalkStaffForm(forms.ModelForm): @@ -46,11 +45,12 @@ class TalkStaffForm(forms.ModelForm): self.fields['category'].queryset = TalkCategory.objects.filter(site=conference.site) self.fields['track'].queryset = Track.objects.filter(site=conference.site) self.fields['room'].queryset = Room.objects.filter(site=conference.site) + self.fields['materials'].required = False if self.instance and self.instance.category and self.instance.category.duration: self.fields['duration'].help_text = _('Default duration: %(duration)d min') % {'duration': self.instance.duration} class Meta(TalkForm.Meta): - fields = ('category', 'track', 'title', 'description', 'notes', 'start_date', 'duration', 'room',) + fields = ('category', 'track', 'title', 'description', 'notes', 'start_date', 'duration', 'room', 'materials', 'video',) labels = { 'category': _('Category'), 'title': _('Title'), diff --git a/cfp/models.py b/cfp/models.py index 1077e00..3861f28 100644 --- a/cfp/models.py +++ b/cfp/models.py @@ -14,7 +14,7 @@ from colorful.fields import RGBColorField import uuid from datetime import timedelta -from os.path import join +from os.path import join, basename from ponyconf.utils import PonyConfModel from mailing.models import MessageThread @@ -241,10 +241,6 @@ class TalkCategory(models.Model): # type of talk (conf 30min, 1h, stand, …) # return self.get_name() -#def talk_materials_destination(talk, filename): -# return join(talk.site.name, talk.slug, filename) - - class TalkManager(models.Manager): def get_queryset(self): qs = super().get_queryset() @@ -325,9 +321,9 @@ class Talk(PonyConfModel): else: return None - #@property - #def materials_name(self): - # return basename(self.materials.name) + @property + def materials_name(self): + return basename(self.materials.name) class Meta: ordering = ('category__id', 'title',) diff --git a/cfp/templates/cfp/staff/talk_details.html b/cfp/templates/cfp/staff/talk_details.html index 5d9c21d..3e8f386 100644 --- a/cfp/templates/cfp/staff/talk_details.html +++ b/cfp/templates/cfp/staff/talk_details.html @@ -44,7 +44,8 @@ {% if talk.registration_required %}