From b70e6f7816e9ee915fdcdbdd6867cd5d74dd471d Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 15 Jul 2013 10:10:20 +0200 Subject: [PATCH] fix no period, fix document.save --- teleforma/models/core.py | 5 +++-- teleforma/views/core.py | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/teleforma/models/core.py b/teleforma/models/core.py index a3edc569..ad4f4039 100644 --- a/teleforma/models/core.py +++ b/teleforma/models/core.py @@ -490,9 +490,10 @@ class Document(MediaBase): return ' - '.join([unicode(self.course), unicode(types), self.title ]) def save(self, **kwargs): - super(Document, self).save(**kwargs) - self.course.save() + if not self.is_annal: + self.course.save() self.set_mime_type() + super(Document, self).save(**kwargs) class Meta(MetaCore): db_table = app_label + '_' + 'document' diff --git a/teleforma/views/core.py b/teleforma/views/core.py index e15a2f8c..5366172b 100644 --- a/teleforma/views/core.py +++ b/teleforma/views/core.py @@ -192,10 +192,11 @@ class PeriodAccessMixin(View): def get_context_data(self, **kwargs): context = super(PeriodAccessMixin, self).get_context_data(**kwargs) - period = Period.objects.filter(id=int(self.kwargs['period_id'])) - if period: - self.period = period[0] - context['period'] = self.period + if 'period_id' in self.kwargs.keys(): + period = Period.objects.filter(id=int(self.kwargs['period_id'])) + if period: + self.period = period[0] + context['period'] = self.period return context def render_to_response(self, context): -- 2.39.5