From ad93d8ed5abbfdc89b634170ac57ab7666cddd3b Mon Sep 17 00:00:00 2001 From: yomguy Date: Thu, 21 Feb 2013 12:33:32 +0100 Subject: [PATCH] auto add related conf.seminar to auditor, fix admin confs --- teleforma/admin.py | 2 +- teleforma/models/pro.py | 12 +++++++++++- teleforma/templates/teleforma/seminar_detail.html | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/teleforma/admin.py b/teleforma/admin.py index 4feb2a1b..44c80d5e 100644 --- a/teleforma/admin.py +++ b/teleforma/admin.py @@ -18,7 +18,7 @@ class AEStudentProfileInline(admin.StackedInline): class AuditorProfileInline(admin.StackedInline): model = Auditor - filter_horizontal = ['seminars'] + filter_horizontal = ['seminars', 'conferences'] class StudentAdmin(admin.ModelAdmin): model = Student diff --git a/teleforma/models/pro.py b/teleforma/models/pro.py index d4198a1f..3f633db7 100755 --- a/teleforma/models/pro.py +++ b/teleforma/models/pro.py @@ -93,7 +93,7 @@ class Seminar(Displayable): blank=True, null=True) form = models.ForeignKey(Form, related_name='seminar', verbose_name=_('form'), blank=True, null=True) - conference = models.ForeignKey('Conference', related_name='conference', + conference = models.ForeignKey('Conference', related_name='seminar', verbose_name=_('conference'), blank=True, null=True, on_delete=models.SET_NULL) @@ -264,6 +264,16 @@ class Auditor(models.Model): except: return '' + def save(self, **kwargs): + super(Auditor, self).save(**kwargs) + for conference in self.conferences: + try: + seminar = conference.seminar.get() + if not seminar in self.seminars: + self.seminars.add(seminar) + except: + continue + class Meta(MetaCore): db_table = app_label + '_' + 'auditor' verbose_name = _('Auditor') diff --git a/teleforma/templates/teleforma/seminar_detail.html b/teleforma/templates/teleforma/seminar_detail.html index 30ef9808..3a882e65 100644 --- a/teleforma/templates/teleforma/seminar_detail.html +++ b/teleforma/templates/teleforma/seminar_detail.html @@ -99,6 +99,7 @@ $(function () { {% endwith %} + {% with seminar.question as questions %}
-- 2.39.5