auto add related conf.seminar to auditor, fix admin confs

diff --git a/teleforma/admin.py b/teleforma/admin.py
index 4feb2a1b00ca040ea16e5b37245a5a47010225a6..44c80d5ea2ccc920c6c99bc3ba4e981abd4d6541 100644 (file)
--- 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 d4198a1fd731c7d7c2437309fac4173e9e691183..3f633db7a13b29ee26913946410e4701f76cf021 100755 (executable)
--- 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 30ef9808c924257cfc403f73e35dd96db08ffc63..3a882e656ed84f842573c1e3950d5a3898b20d43 100644 (file)
--- a/teleforma/templates/teleforma/seminar_detail.html
+++ b/teleforma/templates/teleforma/seminar_detail.html
@@ -99,6 +99,7 @@ $(function () {
        </div>
       {% endwith %}
 
+
      {% with seminar.question as questions %}
        <div class="course_content">
         <div class="course_subtitle">